cvs: pear /PEAR_Frontend_Gtk Gtk.php /PEAR_Frontend_Gtk/Gtk Config.php DirSelect.php Summary.php installer.glade /PEAR_Frontend_Gtk/Gtk/xpm
black_close_icon.xpm
| From: | Alan Knowles | Date: | Thu, 13 Jun 2002 06:57:17 +0000 |
| Subject: | cvs: pear /PEAR_Frontend_Gtk Gtk.php /PEAR_Frontend_Gtk/Gtk Config.php DirSelect.php Summary.php installer.glade /PEAR_Frontend_Gtk/Gtk/xpm black_close_icon.xpm |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-4593@lists.php.net to get a copy of this message | ||
alan_k Thu Jun 13 02:57:17 2002 EDT
Modified files:
/pear/PEAR_Frontend_Gtk Gtk.php
/pear/PEAR_Frontend_Gtk/Gtk Config.php DirSelect.php Summary.php
installer.glade
/pear/PEAR_Frontend_Gtk/Gtk/xpm black_close_icon.xpm
Log:
Configuration Saving Now working
Index: pear/PEAR_Frontend_Gtk/Gtk.php diff -u pear/PEAR_Frontend_Gtk/Gtk.php:1.13 pear/PEAR_Frontend_Gtk/Gtk.php:1.14 --- pear/PEAR_Frontend_Gtk/Gtk.php:1.13 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk.php Thu Jun 13 02:57:12 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Gtk.php,v 1.13 2002/06/03 10:10:45 alan_k Exp $ + $Id: Gtk.php,v 1.14 2002/06/13 06:57:12 alan_k Exp $ */ require_once "PEAR.php"; @@ -232,17 +232,25 @@ $this->_packages->loadPackageList(); - $this->_setStyle('black_bg1','#FFFFFF','#000000',TRUE); + $this->_setStyle('black_bg1','#FFFFFF','#000000',FALSE); $this->_setStyle('black_bg2','#FFFFFF','#000000',TRUE); - $this->_setStyle('black_bg3','#FFFFFF','#000000',TRUE); + $this->_setStyle('black_bg3','#FFFFFF','#000000',FALSE); $this->_setStyle('black_bg4','#FFFFFF','#000000',TRUE); //$this->_setStyle('download_list','#000000','#FFFFFF',TRUE); + + //$this->_widget_close_details->set_style($newstyle); $this->_setStyle('close_details','#FFFFFF','#000000',FALSE); + $this->_loadButton('close_details' , 'black_close_icon.xpm',TRUE); + + + // sort out the text. $this->_setStyle('summary' ,'#FFFFFF','#000000',TRUE); - $this->_setStyle('black_msg1','#FFFFFF','#000000',TRUE); + $this->_setFont('summary','-*-helvetica-bold-r-normal-*-*-80-*-*-p-*-iso8859-1'); + + $this->_setStyle('black_msg1','#FFFFFF','#000000',FALSE); $newstyle = &new GtkStyle(); $this->_widget_packages_install->set_style($newstyle); @@ -250,8 +258,10 @@ $this->_loadButton('pear_installer_button' ,'nav_installer.xpm'); $this->_loadButton('config_button' , 'nav_configuration.xpm'); $this->_loadButton('documentation_button' , 'nav_documentation.xpm'); - $this->_loadButton('close_details' , 'black_close_icon.xpm'); - + + //$this->_setStyleWidget($pixmap,'#000000','#339900',FALSE); + + $this->_setStyle('package_logo','#000000','#339900',TRUE); $this->_setStyle('package_logo_text','#FFFFFF','#339900'); $this->_setFont('package_logo_text','-*-helvetica-bold-r-normal-*-*-100-*-*-p-*-iso8859-1'); @@ -303,19 +313,20 @@ * * @param string widget name * @param string icon name + * @param boolean relief - the left menu is FALSE, other buttons are TRUE * @access private */ - function _loadButton($widgetname, $icon) { + function &_loadButton($widgetname, $icon, $relief=FALSE) { //echo $widgetname; $widget_fullname = "_widget_". $widgetname; $widget = &$this->$widget_fullname; $child = $widget->child; - if ($child) - if (get_class($child) == "GtkVBox") return; - - $widget->set_relief(GTK_RELIEF_NONE); + //if ($child) + // if (get_class($child) == "GtkVBox") return; + if (!$relief) + $widget->set_relief(GTK_RELIEF_NONE); //$widget->set_usize(150,100); $vbox = new GtkVBox; @@ -331,6 +342,7 @@ //$widget->set_usize(150,100); $vbox->show(); $pixmap->show(); + return $vbox; } @@ -347,7 +359,10 @@ function _setStyle($widgetname,$fgcolor='',$bgcolor='',$copy=FALSE) { //echo "SET: $widgetname: $fgcolor/$bgcolor ". ((int) $copy) . "\n"; $widget_fullname = "_widget_". $widgetname; - $widget = &$this->$widget_fullname; + + $this->_setStyleWidget($this->$widget_fullname,$fgcolor,$bgcolor,$copy) ; + } + function _setStyleWidget(&$widget,$fgcolor='',$bgcolor='',$copy=FALSE) { if ($copy) { $oldstyle = $widget->get_style(); $newstyle = $oldstyle->copy(); @@ -361,6 +376,7 @@ $newstyle->fg[GTK_STATE_ACTIVE] = $fg; $newstyle->fg[GTK_STATE_SELECTED] = $fg; $newstyle->fg[GTK_STATE_INSENSITIVE] = $fg; + //$newstyle->bg_pixmap=NULL; } if ($bgcolor) { // set background color $bg = &new GdkColor($bgcolor); @@ -369,6 +385,7 @@ $newstyle->bg[GTK_STATE_ACTIVE] = $bg; $newstyle->bg[GTK_STATE_SELECTED] = $bg; $newstyle->bg[GTK_STATE_INSENSITIVE] = $bg; + //$newstyle->bg_pixmap=NULL; } $widget->set_style($newstyle); Index: pear/PEAR_Frontend_Gtk/Gtk/Config.php diff -u pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.1 pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.1 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/Config.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Config.php,v 1.1 2002/06/03 10:10:45 alan_k Exp $ + $Id: Config.php,v 1.2 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -57,6 +57,13 @@ */ var $reset; /** + * The New configuration + * + * @var array asssociative key=>value + * @access private + */ + var $NewConfig; + /** * Constructor * * @param array see config-show for more details. @@ -75,6 +82,7 @@ * @param string no idea yet! */ function loadConfig($widget=NULL,$what=NULL) { + $this->NewConfig= array(); if ($this->_configTabs) foreach (array_keys($this->_configTabs) as $k) { $page = $this->notebook->page_num($this->_configTabs[$k]); @@ -133,13 +141,13 @@ switch ($type) { case 'string': case 'password': - case 'int': // umask: should really be checkboxes.. + //case 'int': // umask: should really be checkboxes.. $gtkentry = &new GtkEntry(); $gtkentry->set_text($v); $gtkentry->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - $gtkentry->connect_object_after('changed', array(&$this,'_ActivateConfigSave')); + $gtkentry->connect_after('changed', array(&$this,'_textChanged'),$k,$v); if ($type == 'password') $gtkentry->set_visibility(FALSE); $gtkentry->show(); @@ -156,7 +164,7 @@ $gtkentry->show(); $gtktable->attach($gtkentry, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); $gtkbutton = &new GtkButton('...'); - $gtkbutton->connect_object_after('clicked', array(&$this->ui->_dirselect,'onDirSelect'),$gtkentry); + $gtkbutton->connect_object_after('clicked', array(&$this->ui->_dirselect,'onDirSelect'),$gtkentry,$k); $gtkbutton->show(); $gtktable->attach($gtkbutton, 2, 3, $r, $r+1, GTK_SHRINK,GTK_SHRINK); break; @@ -167,7 +175,7 @@ $sel = 0; foreach($options as $i=>$option) { $items[$i] = &new GtkMenuItem($option); - //$items[$i]->connect('activate', 'echo_activated', $labels[$i], $pos[$i], + $items[$i]->connect_object_after('activate', array(&$this, '_optionSelect'),$k,$option, $v); $gtkmenu->append($items[$i]); if ($option == $v) $sel = $i; @@ -178,7 +186,7 @@ $gtkoptionmenu->set_menu($gtkmenu); $gtkoptionmenu->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - + $gtkoptionmenu->show(); $gtktable->attach($gtkoptionmenu, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); break; @@ -189,9 +197,48 @@ $gtkspinbutton->show(); $gtkspinbutton->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - + $gtkspinbutton->connect_after('changed', array(&$this,'_SpinChanged'),$k,$v); + $gtktable->attach($gtkspinbutton, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); break; + + case 'mask': // unix file mask -- a table with lots of checkboxes... + ; + $gtklabel->set_alignment(0.0, 0.1); + $masktable = &new GtkTable(); + $masktable->set_row_spacings(0); + $masktable->set_col_spacings(10); + $masktable->set_border_width(0); + $masktable->show(); + $rows = array('User','Group','Everybody'); + $cols = array('Read','Write','Execute'); + $mult = 64; + foreach($rows as $i=>$string) { + + $label = &new GtkLabel($string); + $label->set_justify(GTK_JUSTIFY_LEFT); + $label->set_alignment(0.0, 0.5); + $label->show(); + $masktable->attach($label, 0, 1, $i, $i+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + $add =4; + foreach($cols as $j=>$string) { + + if ($i) $string = ''; // first row show text only! + $gtkcheckbutton = new GtkCheckButton($string); + if (($mult * $add) & $v) $gtkcheckbutton->set_active(TRUE); + $gtkcheckbutton->show(); + $gtkcheckbutton->connect_object_after('enter_notify_event', + array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); + $gtkcheckbutton->connect_after('toggled',array(&$this,'_maskToggled'),$k,$mult * $add,$v); + $masktable->attach($gtkcheckbutton , $j+1, $j+2, $i, $i+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + $add = $add/2; + } + $mult = $mult/8; + } + + + $gtktable->attach($masktable, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + break; default: echo "$prompt : ". $this->ui->config->getType($k) . "\n"; } @@ -237,18 +284,65 @@ } + + function _textChanged($widget,$key,$original) { + $this->NewConfig[$key] = $widget->get_text(); + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + + function _optionSelect($key,$value,$original) { + $this->NewConfig[$key] = $value; + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + function _spinChanged($widget,$key,$original) { + $this->NewConfig[$key] = $widget->get_value_as_int(); + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + function _maskToggled($widget,$key,$value,$original) { + if (!@$this->NewConfig[$key]) $this->NewConfig[$key] = $original; + // set: + if ($widget->get_active()) { + if (!($value & $this->NewConfig[$key])) $this->NewConfig[$key] += $value; + } else { // unset + if ($value & $this->NewConfig[$key]) $this->NewConfig[$key] -= $value; + } + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + $this->ActivateConfigSave(); + } + + + /** * Make the Save and reset buttons pressable. * */ function ActivateConfigSave() { - $this->save->set_sensitive(TRUE); - $this->reset->set_sensitive(TRUE); + $set = TRUE; + if (!$this->NewConfig) $set = FALSE; + $this->save->set_sensitive($set); + $this->reset->set_sensitive($set); } function saveConfig() { + //mmh now what :) - + $cmd = PEAR_Command::factory('config-set',$this->ui->config); + foreach ($this->NewConfig as $k=>$v) + $cmd->doConfigSet('config-set' ,'', array($k,$v)); + $this->loadConfig(); } Index: pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php diff -u pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.1 pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.1 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: DirSelect.php,v 1.1 2002/06/03 10:10:45 alan_k Exp $ + $Id: DirSelect.php,v 1.2 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -70,6 +70,13 @@ */ var $_DirSelectActiveWidget = NULL; /** + * Currently active configuration key + * + * @var string + * @access private + */ + var $_DirSelectActiveKey = NULL; + /** * Display the Directory selection dialog * * Displays the directory dialog, fills in the data etc. @@ -77,8 +84,9 @@ * @param object gtkentry The text entry to fill in on closing * */ - function onDirSelect($widget) { + function onDirSelect($widget,$key) { // set the title!! + $this->_DirSelectActiveKey = $key; $this->_DirSelectActiveWidget = &$widget; $prompt = 'xxx'; $prompt = $this->ui->config->getPrompt($widget->get_data('key')); @@ -240,6 +248,7 @@ if ($new != $old) { $this->_DirSelectActiveWidget->set_text($new); + $this->ui->_config->NewConfig[$this->_DirSelectActiveKey] = $new; $this->ui->_config->ActivateConfigSave(); } Index: pear/PEAR_Frontend_Gtk/Gtk/Summary.php diff -u pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.5 pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.6 --- pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.5 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/Summary.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Summary.php,v 1.5 2002/06/03 10:10:45 alan_k Exp $ + $Id: Summary.php,v 1.6 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -75,7 +75,7 @@ switch (get_class($w)) { case 'GtkLabel': case 'GtkEntry': - $w->set_text($v); + $w->set_text(str_replace('\n',' ',$v)); break; case 'GtkText': $w->delete_text(0,-1); @@ -84,8 +84,10 @@ } } + $vadj = $this->ui->_widget_description_sw->get_vadjustment(); + $vadj->set_value(0); $this->_detailsVisableFlag = $package->name; - + } function toggle(&$package) { @@ -100,6 +102,7 @@ function hide() { + $this->ui->_widget_details_area->hide(); $this->_detailsVisableFlag = ''; Index: pear/PEAR_Frontend_Gtk/Gtk/installer.glade diff -u pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.8 pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.9 --- pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.8 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/installer.glade Thu Jun 13 02:57:13 2002 @@ -625,13 +625,15 @@ </child> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow7</name> - <height>22</height> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> + <class>GtkNotebook</class> + <name>black_bg3</name> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> <child> <padding>0</padding> <expand>False</expand> @@ -639,21 +641,80 @@ </child> <widget> - <class>GtkLayout</class> - <name>black_bg3</name> - <area_width>400</area_width> - <area_height>400</area_height> - <hstep>10</hstep> - <vstep>10</vstep> + <class>GtkNotebook</class> + <name>black_bg2</name> + <height>18</height> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> + + <widget> + <class>GtkHBox</class> + <name>hbox14</name> + <border_width>2</border_width> + <height>18</height> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + + <widget> + <class>GtkLabel</class> + <name>summary</name> + <height>18</height> + <label>Select the Packages You want to Install</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>2.23517e-08</xalign> + <yalign>0.5</yalign> + <xpad>7</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + <pack>GTK_PACK_END</pack> + </child> + </widget> + + <widget> + <class>GtkToolbar</class> + <name>toolbar1</name> + <height>18</height> + <orientation>GTK_ORIENTATION_HORIZONTAL</orientation> + <type>GTK_TOOLBAR_ICONS</type> + <space_size>0</space_size> + <space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style> + <relief>GTK_RELIEF_NORMAL</relief> + <tooltips>False</tooltips> + <child> + <padding>3</padding> + <expand>False</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkButton</class> + <child_name>Toolbar:button</child_name> + <name>close_details</name> + <height>18</height> + <signal> + <name>clicked</name> + <handler>_summary_hide</handler> + <last_modification_time>Thu, 13 Jun 2002 04:50:28 GMT</last_modification_time> + </signal> + <label>button26</label> + </widget> + </widget> + </widget> <widget> <class>GtkLabel</class> - <name>summary</name> - <x>24</x> - <y>0</y> - <width>0</width> - <height>0</height> - <label>label44</label> + <child_name>Notebook:tab</child_name> + <name>label80</name> + <label>label77</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -661,26 +722,25 @@ <xpad>0</xpad> <ypad>0</ypad> </widget> + </widget> - <widget> - <class>GtkButton</class> - <child_name>Toolbar:button</child_name> - <name>close_details</name> - <x>0</x> - <y>0</y> - <width>20</width> - <height>20</height> - - <widget> - <class>Placeholder</class> - </widget> - </widget> + <widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label76</name> + <label>label76</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> </widget> </widget> <widget> <class>GtkScrolledWindow</class> - <name>scrolledwindow3</name> + <name>description_sw</name> <border_width>3</border_width> <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> @@ -704,10 +764,15 @@ </widget> <widget> - <class>GtkHBox</class> - <name>hbox4</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> + <class>GtkNotebook</class> + <name>black_bg1</name> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> <child> <padding>0</padding> <expand>False</expand> @@ -715,86 +780,60 @@ </child> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow5</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> + <class>GtkHBox</class> + <name>hbox13</name> + <border_width>2</border_width> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <widget> - <class>GtkLayout</class> - <name>black_bg1</name> - <height>30</height> - <area_width>400</area_width> - <area_height>400</area_height> - <hstep>10</hstep> - <vstep>10</vstep> + <class>GtkLabel</class> + <name>black_msg1</name> + <label>Select the Packages You want to Install</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>2.23517e-08</xalign> + <yalign>0.5</yalign> + <xpad>7</xpad> + <ypad>2</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> - <widget> - <class>GtkLabel</class> - <name>black_msg1</name> - <x>8</x> - <y>8</y> - <width>0</width> - <height>0</height> - <label>Select the Packages You want to Install</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> + <widget> + <class>GtkButton</class> + <name>packages_install</name> + <border_width>4</border_width> + <can_focus>True</can_focus> + <signal> + <name>clicked</name> + <handler>_install_start</handler> + <last_modification_time>Mon, 03 Jun 2002 05:16:53 GMT</last_modification_time> + </signal> + <label>Download And Install >></label> + <relief>GTK_RELIEF_NORMAL</relief> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow6</name> - <width>180</width> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkLayout</class> - <name>black_bg2</name> - <width>0</width> - <height>33</height> - <area_width>140</area_width> - <area_height>400</area_height> - <hstep>5</hstep> - <vstep>5</vstep> - - <widget> - <class>GtkButton</class> - <name>packages_install</name> - <x>8</x> - <y>8</y> - <width>0</width> - <height>0</height> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>_install_start</handler> - <last_modification_time>Mon, 03 Jun 2002 05:16:53 GMT</last_modification_time> - </signal> - <label>Download And Install >></label> - <relief>GTK_RELIEF_NORMAL</relief> - </widget> - </widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label77</name> + <label>label77</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> </widget> </widget> </widget> Index: pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm diff -u pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.1 pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.1 Tue May 28 05:57:54 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm Thu Jun 13 02:57:13 2002 @@ -1,7 +1,7 @@ /* XPM */ static char * black_close_icon_xpm[] = { "12 12 52 1", -" c None", +" c #000000", ". c #424242", "+ c #777777", "@ c #616161",
Index: pear/PEAR_Frontend_Gtk/Gtk.php diff -u pear/PEAR_Frontend_Gtk/Gtk.php:1.13 pear/PEAR_Frontend_Gtk/Gtk.php:1.14 --- pear/PEAR_Frontend_Gtk/Gtk.php:1.13 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk.php Thu Jun 13 02:57:12 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Gtk.php,v 1.13 2002/06/03 10:10:45 alan_k Exp $ + $Id: Gtk.php,v 1.14 2002/06/13 06:57:12 alan_k Exp $ */ require_once "PEAR.php"; @@ -232,17 +232,25 @@ $this->_packages->loadPackageList(); - $this->_setStyle('black_bg1','#FFFFFF','#000000',TRUE); + $this->_setStyle('black_bg1','#FFFFFF','#000000',FALSE); $this->_setStyle('black_bg2','#FFFFFF','#000000',TRUE); - $this->_setStyle('black_bg3','#FFFFFF','#000000',TRUE); + $this->_setStyle('black_bg3','#FFFFFF','#000000',FALSE); $this->_setStyle('black_bg4','#FFFFFF','#000000',TRUE); //$this->_setStyle('download_list','#000000','#FFFFFF',TRUE); + + //$this->_widget_close_details->set_style($newstyle); $this->_setStyle('close_details','#FFFFFF','#000000',FALSE); + $this->_loadButton('close_details' , 'black_close_icon.xpm',TRUE); + + + // sort out the text. $this->_setStyle('summary' ,'#FFFFFF','#000000',TRUE); - $this->_setStyle('black_msg1','#FFFFFF','#000000',TRUE); + $this->_setFont('summary','-*-helvetica-bold-r-normal-*-*-80-*-*-p-*-iso8859-1'); + + $this->_setStyle('black_msg1','#FFFFFF','#000000',FALSE); $newstyle = &new GtkStyle(); $this->_widget_packages_install->set_style($newstyle); @@ -250,8 +258,10 @@ $this->_loadButton('pear_installer_button' ,'nav_installer.xpm'); $this->_loadButton('config_button' , 'nav_configuration.xpm'); $this->_loadButton('documentation_button' , 'nav_documentation.xpm'); - $this->_loadButton('close_details' , 'black_close_icon.xpm'); - + + //$this->_setStyleWidget($pixmap,'#000000','#339900',FALSE); + + $this->_setStyle('package_logo','#000000','#339900',TRUE); $this->_setStyle('package_logo_text','#FFFFFF','#339900'); $this->_setFont('package_logo_text','-*-helvetica-bold-r-normal-*-*-100-*-*-p-*-iso8859-1'); @@ -303,19 +313,20 @@ * * @param string widget name * @param string icon name + * @param boolean relief - the left menu is FALSE, other buttons are TRUE * @access private */ - function _loadButton($widgetname, $icon) { + function &_loadButton($widgetname, $icon, $relief=FALSE) { //echo $widgetname; $widget_fullname = "_widget_". $widgetname; $widget = &$this->$widget_fullname; $child = $widget->child; - if ($child) - if (get_class($child) == "GtkVBox") return; - - $widget->set_relief(GTK_RELIEF_NONE); + //if ($child) + // if (get_class($child) == "GtkVBox") return; + if (!$relief) + $widget->set_relief(GTK_RELIEF_NONE); //$widget->set_usize(150,100); $vbox = new GtkVBox; @@ -331,6 +342,7 @@ //$widget->set_usize(150,100); $vbox->show(); $pixmap->show(); + return $vbox; } @@ -347,7 +359,10 @@ function _setStyle($widgetname,$fgcolor='',$bgcolor='',$copy=FALSE) { //echo "SET: $widgetname: $fgcolor/$bgcolor ". ((int) $copy) . "\n"; $widget_fullname = "_widget_". $widgetname; - $widget = &$this->$widget_fullname; + + $this->_setStyleWidget($this->$widget_fullname,$fgcolor,$bgcolor,$copy) ; + } + function _setStyleWidget(&$widget,$fgcolor='',$bgcolor='',$copy=FALSE) { if ($copy) { $oldstyle = $widget->get_style(); $newstyle = $oldstyle->copy(); @@ -361,6 +376,7 @@ $newstyle->fg[GTK_STATE_ACTIVE] = $fg; $newstyle->fg[GTK_STATE_SELECTED] = $fg; $newstyle->fg[GTK_STATE_INSENSITIVE] = $fg; + //$newstyle->bg_pixmap=NULL; } if ($bgcolor) { // set background color $bg = &new GdkColor($bgcolor); @@ -369,6 +385,7 @@ $newstyle->bg[GTK_STATE_ACTIVE] = $bg; $newstyle->bg[GTK_STATE_SELECTED] = $bg; $newstyle->bg[GTK_STATE_INSENSITIVE] = $bg; + //$newstyle->bg_pixmap=NULL; } $widget->set_style($newstyle); Index: pear/PEAR_Frontend_Gtk/Gtk/Config.php diff -u pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.1 pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/Config.php:1.1 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/Config.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Config.php,v 1.1 2002/06/03 10:10:45 alan_k Exp $ + $Id: Config.php,v 1.2 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -57,6 +57,13 @@ */ var $reset; /** + * The New configuration + * + * @var array asssociative key=>value + * @access private + */ + var $NewConfig; + /** * Constructor * * @param array see config-show for more details. @@ -75,6 +82,7 @@ * @param string no idea yet! */ function loadConfig($widget=NULL,$what=NULL) { + $this->NewConfig= array(); if ($this->_configTabs) foreach (array_keys($this->_configTabs) as $k) { $page = $this->notebook->page_num($this->_configTabs[$k]); @@ -133,13 +141,13 @@ switch ($type) { case 'string': case 'password': - case 'int': // umask: should really be checkboxes.. + //case 'int': // umask: should really be checkboxes.. $gtkentry = &new GtkEntry(); $gtkentry->set_text($v); $gtkentry->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - $gtkentry->connect_object_after('changed', array(&$this,'_ActivateConfigSave')); + $gtkentry->connect_after('changed', array(&$this,'_textChanged'),$k,$v); if ($type == 'password') $gtkentry->set_visibility(FALSE); $gtkentry->show(); @@ -156,7 +164,7 @@ $gtkentry->show(); $gtktable->attach($gtkentry, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); $gtkbutton = &new GtkButton('...'); - $gtkbutton->connect_object_after('clicked', array(&$this->ui->_dirselect,'onDirSelect'),$gtkentry); + $gtkbutton->connect_object_after('clicked', array(&$this->ui->_dirselect,'onDirSelect'),$gtkentry,$k); $gtkbutton->show(); $gtktable->attach($gtkbutton, 2, 3, $r, $r+1, GTK_SHRINK,GTK_SHRINK); break; @@ -167,7 +175,7 @@ $sel = 0; foreach($options as $i=>$option) { $items[$i] = &new GtkMenuItem($option); - //$items[$i]->connect('activate', 'echo_activated', $labels[$i], $pos[$i], + $items[$i]->connect_object_after('activate', array(&$this, '_optionSelect'),$k,$option, $v); $gtkmenu->append($items[$i]); if ($option == $v) $sel = $i; @@ -178,7 +186,7 @@ $gtkoptionmenu->set_menu($gtkmenu); $gtkoptionmenu->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - + $gtkoptionmenu->show(); $gtktable->attach($gtkoptionmenu, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); break; @@ -189,9 +197,48 @@ $gtkspinbutton->show(); $gtkspinbutton->connect_object_after('enter_notify_event', array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); - + $gtkspinbutton->connect_after('changed', array(&$this,'_SpinChanged'),$k,$v); + $gtktable->attach($gtkspinbutton, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); break; + + case 'mask': // unix file mask -- a table with lots of checkboxes... + ; + $gtklabel->set_alignment(0.0, 0.1); + $masktable = &new GtkTable(); + $masktable->set_row_spacings(0); + $masktable->set_col_spacings(10); + $masktable->set_border_width(0); + $masktable->show(); + $rows = array('User','Group','Everybody'); + $cols = array('Read','Write','Execute'); + $mult = 64; + foreach($rows as $i=>$string) { + + $label = &new GtkLabel($string); + $label->set_justify(GTK_JUSTIFY_LEFT); + $label->set_alignment(0.0, 0.5); + $label->show(); + $masktable->attach($label, 0, 1, $i, $i+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + $add =4; + foreach($cols as $j=>$string) { + + if ($i) $string = ''; // first row show text only! + $gtkcheckbutton = new GtkCheckButton($string); + if (($mult * $add) & $v) $gtkcheckbutton->set_active(TRUE); + $gtkcheckbutton->show(); + $gtkcheckbutton->connect_object_after('enter_notify_event', + array(&$this,'_setConfigHelp'),$this->ui->config->getDocs($k)); + $gtkcheckbutton->connect_after('toggled',array(&$this,'_maskToggled'),$k,$mult * $add,$v); + $masktable->attach($gtkcheckbutton , $j+1, $j+2, $i, $i+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + $add = $add/2; + } + $mult = $mult/8; + } + + + $gtktable->attach($masktable, 1, 2, $r, $r+1, GTK_FILL|GTK_EXPAND,GTK_FILL); + break; default: echo "$prompt : ". $this->ui->config->getType($k) . "\n"; } @@ -237,18 +284,65 @@ } + + function _textChanged($widget,$key,$original) { + $this->NewConfig[$key] = $widget->get_text(); + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + + function _optionSelect($key,$value,$original) { + $this->NewConfig[$key] = $value; + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + function _spinChanged($widget,$key,$original) { + $this->NewConfig[$key] = $widget->get_value_as_int(); + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + + $this->ActivateConfigSave(); + + } + function _maskToggled($widget,$key,$value,$original) { + if (!@$this->NewConfig[$key]) $this->NewConfig[$key] = $original; + // set: + if ($widget->get_active()) { + if (!($value & $this->NewConfig[$key])) $this->NewConfig[$key] += $value; + } else { // unset + if ($value & $this->NewConfig[$key]) $this->NewConfig[$key] -= $value; + } + if ($this->NewConfig[$key] == $original) + unset($this->NewConfig[$key] ); + $this->ActivateConfigSave(); + } + + + /** * Make the Save and reset buttons pressable. * */ function ActivateConfigSave() { - $this->save->set_sensitive(TRUE); - $this->reset->set_sensitive(TRUE); + $set = TRUE; + if (!$this->NewConfig) $set = FALSE; + $this->save->set_sensitive($set); + $this->reset->set_sensitive($set); } function saveConfig() { + //mmh now what :) - + $cmd = PEAR_Command::factory('config-set',$this->ui->config); + foreach ($this->NewConfig as $k=>$v) + $cmd->doConfigSet('config-set' ,'', array($k,$v)); + $this->loadConfig(); } Index: pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php diff -u pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.1 pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php:1.1 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/DirSelect.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: DirSelect.php,v 1.1 2002/06/03 10:10:45 alan_k Exp $ + $Id: DirSelect.php,v 1.2 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -70,6 +70,13 @@ */ var $_DirSelectActiveWidget = NULL; /** + * Currently active configuration key + * + * @var string + * @access private + */ + var $_DirSelectActiveKey = NULL; + /** * Display the Directory selection dialog * * Displays the directory dialog, fills in the data etc. @@ -77,8 +84,9 @@ * @param object gtkentry The text entry to fill in on closing * */ - function onDirSelect($widget) { + function onDirSelect($widget,$key) { // set the title!! + $this->_DirSelectActiveKey = $key; $this->_DirSelectActiveWidget = &$widget; $prompt = 'xxx'; $prompt = $this->ui->config->getPrompt($widget->get_data('key')); @@ -240,6 +248,7 @@ if ($new != $old) { $this->_DirSelectActiveWidget->set_text($new); + $this->ui->_config->NewConfig[$this->_DirSelectActiveKey] = $new; $this->ui->_config->ActivateConfigSave(); } Index: pear/PEAR_Frontend_Gtk/Gtk/Summary.php diff -u pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.5 pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.6 --- pear/PEAR_Frontend_Gtk/Gtk/Summary.php:1.5 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/Summary.php Thu Jun 13 02:57:13 2002 @@ -16,7 +16,7 @@ | Author: Alan Knowles <alan@akbkhome.com> | +----------------------------------------------------------------------+ - $Id: Summary.php,v 1.5 2002/06/03 10:10:45 alan_k Exp $ + $Id: Summary.php,v 1.6 2002/06/13 06:57:13 alan_k Exp $ */ /** @@ -75,7 +75,7 @@ switch (get_class($w)) { case 'GtkLabel': case 'GtkEntry': - $w->set_text($v); + $w->set_text(str_replace('\n',' ',$v)); break; case 'GtkText': $w->delete_text(0,-1); @@ -84,8 +84,10 @@ } } + $vadj = $this->ui->_widget_description_sw->get_vadjustment(); + $vadj->set_value(0); $this->_detailsVisableFlag = $package->name; - + } function toggle(&$package) { @@ -100,6 +102,7 @@ function hide() { + $this->ui->_widget_details_area->hide(); $this->_detailsVisableFlag = ''; Index: pear/PEAR_Frontend_Gtk/Gtk/installer.glade diff -u pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.8 pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.9 --- pear/PEAR_Frontend_Gtk/Gtk/installer.glade:1.8 Mon Jun 3 06:10:45 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/installer.glade Thu Jun 13 02:57:13 2002 @@ -625,13 +625,15 @@ </child> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow7</name> - <height>22</height> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> + <class>GtkNotebook</class> + <name>black_bg3</name> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> <child> <padding>0</padding> <expand>False</expand> @@ -639,21 +641,80 @@ </child> <widget> - <class>GtkLayout</class> - <name>black_bg3</name> - <area_width>400</area_width> - <area_height>400</area_height> - <hstep>10</hstep> - <vstep>10</vstep> + <class>GtkNotebook</class> + <name>black_bg2</name> + <height>18</height> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> + + <widget> + <class>GtkHBox</class> + <name>hbox14</name> + <border_width>2</border_width> + <height>18</height> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + + <widget> + <class>GtkLabel</class> + <name>summary</name> + <height>18</height> + <label>Select the Packages You want to Install</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>2.23517e-08</xalign> + <yalign>0.5</yalign> + <xpad>7</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + <pack>GTK_PACK_END</pack> + </child> + </widget> + + <widget> + <class>GtkToolbar</class> + <name>toolbar1</name> + <height>18</height> + <orientation>GTK_ORIENTATION_HORIZONTAL</orientation> + <type>GTK_TOOLBAR_ICONS</type> + <space_size>0</space_size> + <space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style> + <relief>GTK_RELIEF_NORMAL</relief> + <tooltips>False</tooltips> + <child> + <padding>3</padding> + <expand>False</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkButton</class> + <child_name>Toolbar:button</child_name> + <name>close_details</name> + <height>18</height> + <signal> + <name>clicked</name> + <handler>_summary_hide</handler> + <last_modification_time>Thu, 13 Jun 2002 04:50:28 GMT</last_modification_time> + </signal> + <label>button26</label> + </widget> + </widget> + </widget> <widget> <class>GtkLabel</class> - <name>summary</name> - <x>24</x> - <y>0</y> - <width>0</width> - <height>0</height> - <label>label44</label> + <child_name>Notebook:tab</child_name> + <name>label80</name> + <label>label77</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -661,26 +722,25 @@ <xpad>0</xpad> <ypad>0</ypad> </widget> + </widget> - <widget> - <class>GtkButton</class> - <child_name>Toolbar:button</child_name> - <name>close_details</name> - <x>0</x> - <y>0</y> - <width>20</width> - <height>20</height> - - <widget> - <class>Placeholder</class> - </widget> - </widget> + <widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label76</name> + <label>label76</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> </widget> </widget> <widget> <class>GtkScrolledWindow</class> - <name>scrolledwindow3</name> + <name>description_sw</name> <border_width>3</border_width> <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> @@ -704,10 +764,15 @@ </widget> <widget> - <class>GtkHBox</class> - <name>hbox4</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> + <class>GtkNotebook</class> + <name>black_bg1</name> + <show_tabs>False</show_tabs> + <show_border>True</show_border> + <tab_pos>GTK_POS_TOP</tab_pos> + <scrollable>False</scrollable> + <tab_hborder>2</tab_hborder> + <tab_vborder>2</tab_vborder> + <popup_enable>False</popup_enable> <child> <padding>0</padding> <expand>False</expand> @@ -715,86 +780,60 @@ </child> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow5</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> + <class>GtkHBox</class> + <name>hbox13</name> + <border_width>2</border_width> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <widget> - <class>GtkLayout</class> - <name>black_bg1</name> - <height>30</height> - <area_width>400</area_width> - <area_height>400</area_height> - <hstep>10</hstep> - <vstep>10</vstep> + <class>GtkLabel</class> + <name>black_msg1</name> + <label>Select the Packages You want to Install</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>2.23517e-08</xalign> + <yalign>0.5</yalign> + <xpad>7</xpad> + <ypad>2</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> - <widget> - <class>GtkLabel</class> - <name>black_msg1</name> - <x>8</x> - <y>8</y> - <width>0</width> - <height>0</height> - <label>Select the Packages You want to Install</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> + <widget> + <class>GtkButton</class> + <name>packages_install</name> + <border_width>4</border_width> + <can_focus>True</can_focus> + <signal> + <name>clicked</name> + <handler>_install_start</handler> + <last_modification_time>Mon, 03 Jun 2002 05:16:53 GMT</last_modification_time> + </signal> + <label>Download And Install >></label> + <relief>GTK_RELIEF_NORMAL</relief> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> - <class>GtkScrolledWindow</class> - <name>scrolledwindow6</name> - <width>180</width> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkLayout</class> - <name>black_bg2</name> - <width>0</width> - <height>33</height> - <area_width>140</area_width> - <area_height>400</area_height> - <hstep>5</hstep> - <vstep>5</vstep> - - <widget> - <class>GtkButton</class> - <name>packages_install</name> - <x>8</x> - <y>8</y> - <width>0</width> - <height>0</height> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>_install_start</handler> - <last_modification_time>Mon, 03 Jun 2002 05:16:53 GMT</last_modification_time> - </signal> - <label>Download And Install >></label> - <relief>GTK_RELIEF_NORMAL</relief> - </widget> - </widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label77</name> + <label>label77</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> </widget> </widget> </widget> Index: pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm diff -u pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.1 pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.2 --- pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm:1.1 Tue May 28 05:57:54 2002 +++ pear/PEAR_Frontend_Gtk/Gtk/xpm/black_close_icon.xpm Thu Jun 13 02:57:13 2002 @@ -1,7 +1,7 @@ /* XPM */ static char * black_close_icon_xpm[] = { "12 12 52 1", -" c None", +" c #000000", ". c #424242", "+ c #777777", "@ c #616161",