sharedaemon-cvs

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1017

Modified Files:
	GUISettingsDlg.cpp 
Log Message:
Fixed toolbar position saving and removed some `restart needed` texts from tooltips

Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- GUISettingsDlg.cpp	27 Nov 2003 08:23:11 -0000	1.22
+++ GUISettingsDlg.cpp	27 Nov 2003 10:00:02 -0000	1.23
@@ -161,16 +161,6 @@
 	m_config->SetPath(wxT("/General"));
 
 	/**
-	 * Convert the checkbox value to wx constant for storing in config
-	 * object.
-	 */
-	switch (tool_align) {
-		case 0: tool_align = wxTB_HORIZONTAL; break;
-		case 1: tool_align = wxTB_VERTICAL; break;
-		default: break;
-	}
-
-	/**
 	 * Store some of the old values from config into temporary
 	 * variables, we need them to determine which parts of GUI
 	 * to update in the end of this function.
@@ -184,6 +174,16 @@
 	show_menu = GetShowMenu()->GetValue();
 	icon_set = GetIconSet()->GetString(GetIconSet()->GetSelection());
 
+	/**
+	 * Convert the checkbox value to wx constant for storing in config
+	 * object.
+	 */
+	switch (tool_align) {
+		case 0: tool_align = wxTB_HORIZONTAL; break;
+		case 1: tool_align = wxTB_VERTICAL; break;
+		default: break;
+	}
+
 	/* Save to config object. */
 
 	/* General data */
@@ -411,7 +411,7 @@
 	wxString *strs10 = (wxString*) NULL;
 	wxChoice *item10 = new wxChoice( this, ID_ICONSET, wxDefaultPosition, wxSize(100,-1), 0, strs10, 0 );
 #ifndef __WXX11__
-	item10->SetToolTip( _("Change the iconet the interface should use. Requires restart to take effect") );
+	item10->SetToolTip( _("Change the iconet the interface should use.") );
 #endif
 	item8->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
 
@@ -501,7 +501,7 @@
 	wxCheckBox *item27 = new wxCheckBox( this, ID_SHOWTOOL, _("Show ToolBar"), wxDefaultPosition, wxDefaultSize, 0 );
 	item27->SetValue( TRUE );
 #ifndef __WXX11__
-	item27->SetToolTip( _("Toggle wether toolbar is shown or not. Requires restart to take effect.") );
+	item27->SetToolTip( _("Toggle wether toolbar is shown or not.") );
 #endif
 	item26->Add( item27, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|border_style, 5 );
 
@@ -511,7 +511,7 @@
 	};
 	wxChoice *item28 = new wxChoice( this, ID_TOOLALIGN, wxDefaultPosition, wxSize(100,-1), 2, strs28, 0 );
 #ifndef __WXX11__
-	item28->SetToolTip( _("Horizontal tooltip is shown on top of window (default), vertical is shown on the left side of window. Requires restart to take effect.") );
+	item28->SetToolTip( _("Horizontal tooltip is shown on top of window (default), vertical is shown on the left side of window.") );
 #endif
 	item26->Add( item28, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|border_style, 5 );
 
@@ -519,7 +519,7 @@
 
 	wxCheckBox *item29 = new wxCheckBox( this, ID_SHOWMENU, _("Show MenuBar"), wxDefaultPosition, wxDefaultSize, 0 );
 #ifndef __WXX11__
-	item29->SetToolTip( _("Toggle wether menubar (file/view etc) should be shown or not. Requires restart to take effect.") );
+	item29->SetToolTip( _("Toggle wether menubar (file/view etc) should be shown or not.") );
 #endif
 	item23->Add( item29, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|border_style, 5 );