|
From: <ma...@us...> - 2003-12-06 00:45:39
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8778
Modified Files:
GUISettingsDlg.cpp ServerWnd.cpp ServerWnd.h
Log Message:
Using textbutton instead of bitmapbutton as sidebar toggler to get nicer look under XP
Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- GUISettingsDlg.cpp 30 Nov 2003 23:07:27 -0000 1.25
+++ GUISettingsDlg.cpp 6 Dec 2003 00:45:36 -0000 1.26
@@ -248,7 +248,6 @@
mainframe->CreateMyToolBar();
/* Update server page logbook */
serverwnd->SetLogBookImages();
- serverwnd->SetToggleSideBarImage();
/* Update statistics tree */
statisticswnd->GetTree()->GetTreeImages();
statisticswnd->GetTree()->GenerateTree();
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ServerWnd.cpp 6 Dec 2003 00:18:37 -0000 1.44
+++ ServerWnd.cpp 6 Dec 2003 00:45:36 -0000 1.45
@@ -72,7 +72,6 @@
/* Set the images of static bitmaps on this page. */
GetSSBitmapProvider()->SetBitmap(img->GetImage(wxT("provider")));
- SetToggleSideBarImage();
SetLogBookImages();
}
@@ -95,31 +94,6 @@
m_config->Write(wxT("SideBar"), sidebar->IsShown());
}
-void CServerWnd::SetToggleSideBarImage() {
- if (sidebar->IsShown()) {
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("leftarrow"))
- );
-
- } else {
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("rightarrow"))
- );
- }
-}
-
/* Set log notebook page images */
void CServerWnd::SetLogBookImages() {
m_imagelist = new wxImageList(16, 16);
@@ -251,14 +225,12 @@
logoptions->SetContent(LogOptionsPanel(logoptions, false, false));
sbmain->Add(logoptions, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
- /**
- * Bitmap button between sidebar and splitter
- * window to toggle sidebar on/off
- */
- wxBitmapButton *toggler = new wxBitmapButton(
- this, ID_BTN_TOGGLE_SIDEBAR, img->GetImage(wxT("leftarrow")),
- wxDefaultPosition, wxSize(10,100)
+ /* Button to toggle sidebar on/off */
+ wxButton *toggler = new wxButton(
+ this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"),
+ wxDefaultPosition, wxSize(12, 100)
);
+ toggler->SetFont(wxFont(14, wxNORMAL, wxNORMAL, wxBOLD));
mainsizer->Add(toggler, 0, wxALIGN_CENTER, 5 );
/* Read splitter positions from configuration object. */
@@ -308,15 +280,7 @@
mainsizer->RemoveGrowableCol(2);
mainsizer->AddGrowableCol(1);
sidebar->Hide();
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("rightarrow"))
- );
+ GetBtnToggleSidebar()->SetLabel(wxT(">"));
} else {
mainsizer->Prepend(
sidebar, 0, wxGROW|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5
@@ -324,15 +288,7 @@
mainsizer->RemoveGrowableCol(1);
mainsizer->AddGrowableCol(2);
sidebar->Show();
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("leftarrow"))
- );
+ GetBtnToggleSidebar()->SetLabel(wxT("<"));
}
Layout();
Refresh();
Index: ServerWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ServerWnd.h 27 Nov 2003 08:23:12 -0000 1.30
+++ ServerWnd.h 6 Dec 2003 00:45:36 -0000 1.31
@@ -57,7 +57,6 @@
void AddLogLine(wxString text, bool status = false);
void AddDebugLine(wxString text, bool status = false);
void AddServerLogLine(wxString text, bool status = false);
- void SetToggleSideBarImage();
void SetLogBookImages();
private:
@@ -124,8 +123,8 @@
return (wxSplitterWindow*)
FindWindow(ID_SERVER_SPLITTER_HORIZONTAL);
}
- wxBitmapButton* GetBtnToggleSidebar() {
- return (wxBitmapButton*) FindWindow(ID_BTN_TOGGLE_SIDEBAR);
+ wxButton* GetBtnToggleSidebar() {
+ return (wxButton*) FindWindow(ID_BTN_TOGGLE_SIDEBAR);
}
wxStaticBitmap* GetSSBitmapProvider() {
return (wxStaticBitmap*) FindWindow(ID_SS_SERVER_IMG);
|