Menu
▾
▴
[ShareDaemon-CVS] ui-wx/src ServerWnd.cpp,1.37,1.38 ServerWnd.h,1.26,1.27 wxInterface_wdr.cpp,1.1,1.2 wxInterface_wdr.h,1.1,1.2 wxInterface.wdr,1.1,1.2
|
From: <ma...@us...> - 2003-11-21 12:46:14
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16982
Modified Files:
ServerWnd.cpp ServerWnd.h wxInterface_wdr.cpp
wxInterface_wdr.h wxInterface.wdr
Log Message:
Minor sizing changes and removed ServerList image from server page.
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ServerWnd.cpp 20 Nov 2003 01:27:26 -0000 1.37
+++ ServerWnd.cpp 21 Nov 2003 12:46:10 -0000 1.38
@@ -70,7 +70,6 @@
Hide();
/* Set the images of static bitmaps on this page. */
- GetServerListImage()->SetBitmap(img->servers);
GetSSBitmapProvider()->SetBitmap(img->provider);
GetBtnToggleSidebar()->SetBitmapLabel(img->leftarrow);
Index: ServerWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ServerWnd.h 20 Nov 2003 01:27:26 -0000 1.26
+++ ServerWnd.h 21 Nov 2003 12:46:10 -0000 1.27
@@ -93,9 +93,6 @@
wxTextCtrl* GetDebugLog() {
return (wxTextCtrl*) FindWindow( ID_DEBUGLOG );
}
- wxTextCtrl* GetServerLog() {
- return (wxTextCtrl*) FindWindow( ID_SERVERINFO );
- }
wxButton* GetUpdate() {
return (wxButton*) FindWindow( ID_UPDATE );
}
@@ -108,15 +105,9 @@
wxTextCtrl* GetServerip() {
return (wxTextCtrl*) FindWindow( ID_SERVERIP );
}
- wxStaticText* GetTxtServer() {
- return (wxStaticText*) FindWindow( ID_TXT_SERVER );
- }
wxSplitterWindow* GetHorizontalSplitter() {
return (wxSplitterWindow*)
FindWindow(ID_SERVER_SPLITTER_HORIZONTAL);
- }
- wxStaticBitmap* GetServerListImage() {
- return (wxStaticBitmap*) FindWindow(ID_SERVERS_IMAGE);
}
wxBitmapButton* GetBtnToggleSidebar() {
return (wxBitmapButton*) FindWindow(ID_BTN_TOGGLE_SIDEBAR);
Index: wxInterface_wdr.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxInterface_wdr.cpp 20 Nov 2003 01:27:26 -0000 1.1
+++ wxInterface_wdr.cpp 21 Nov 2003 12:46:10 -0000 1.2
@@ -56,44 +56,11 @@
wxFlexGridSizer *item1 = new wxFlexGridSizer( 1, 0, 0 );
item1->AddGrowableCol( 0 );
- item1->AddGrowableRow( 1 );
-
- wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
-
- wxStaticBitmap *item3 = new wxStaticBitmap( parent, ID_SERVERS_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item2->Add( item3, 0, wxALIGN_CENTER|wxTOP|wxBOTTOM, 5 );
-
- wxStaticText *item4 = new wxStaticText( parent, ID_TXT_SERVER, _("Servers"), wxDefaultPosition, wxDefaultSize, 0 );
- item2->Add( item4, 0, wxALIGN_CENTER|wxALL, 5 );
-
- item1->Add( item2, 0, 0, 5 );
-
- CServerListCtrl *item5 = new CServerListCtrl( parent, ID_SERVERLISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
- item1->Add( item5, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5 );
-
- item0->Add( item1, 0, wxGROW, 5 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
+ item1->AddGrowableRow( 0 );
-wxSizer *ServerInfo( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
+ CServerListCtrl *item2 = new CServerListCtrl( parent, ID_SERVERLISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+ item1->Add( item2, 0, wxGROW|wxRIGHT|wxTOP, 5 );
- wxTextCtrl *item1 = new wxTextCtrl( parent, ID_SERVERINFO, wxT(""), wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE|wxTE_READONLY );
item0->Add( item1, 0, wxGROW, 5 );
if (set_sizer)
@@ -949,7 +916,7 @@
DebugLog( item4, FALSE );
item2->AddPage( item4, _("Debug Log") );
- item0->Add( item1, 0, wxGROW|wxALL, 5 );
+ item0->Add( item1, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5 );
if (set_sizer)
{
Index: wxInterface_wdr.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxInterface_wdr.h 20 Nov 2003 01:27:26 -0000 1.1
+++ wxInterface_wdr.h 21 Nov 2003 12:46:10 -0000 1.2
@@ -28,139 +28,134 @@
// Declare window functions
-#define ID_SERVERS_IMAGE 10000
-#define ID_TXT_SERVER 10001
-#define ID_SERVERLISTCTRL 10002
+#define ID_SERVERLISTCTRL 10000
wxSizer *Server_List( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_SERVERINFO 10003
-wxSizer *ServerInfo( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_LOG 10004
+#define ID_LOG 10001
wxSizer *Log( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_DEBUGLOG 10005
+#define ID_DEBUGLOG 10002
wxSizer *DebugLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_TEXT 10006
-#define ID_SEARCHSTRING 10007
-#define ID_SEARCHMETHOD 10008
-#define ID_SEARCHTYPE 10009
-#define ID_BTN_RESET 10010
-#define ID_MINSIZE 10011
-#define ID_MAXSIZE 10012
-#define ID_AVAIL 10013
-#define ID_EXTENSION 10014
-#define ID_TEXTCTRL 10015
-#define ID_SEARCH_RESULTS_IMAGE 10016
-#define ID_BUTTON 10017
-#define ID_SEARCHRESULTS 10018
-#define ID_GAUGE 10019
+#define ID_TEXT 10003
+#define ID_SEARCHSTRING 10004
+#define ID_SEARCHMETHOD 10005
+#define ID_SEARCHTYPE 10006
+#define ID_BTN_RESET 10007
+#define ID_MINSIZE 10008
+#define ID_MAXSIZE 10009
+#define ID_AVAIL 10010
+#define ID_EXTENSION 10011
+#define ID_TEXTCTRL 10012
+#define ID_SEARCH_RESULTS_IMAGE 10013
+#define ID_BUTTON 10014
+#define ID_SEARCHRESULTS 10015
+#define ID_GAUGE 10016
wxSizer *SearchWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
wxSizer *ContentSizer( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_SHARED_FILES_IMAGE 10020
-#define ID_TXT_SHARED 10021
-#define ID_SHAREDLISTCTRL 10022
-#define ID_CURSES_REQUESTS 10023
-#define ID_CURSES_ACCEPTED_UPLOADS 10024
-#define ID_CURSES_TRANSFERRED 10025
-#define ID_G_REQUESTS 10026
-#define ID_G_UPLOADS 10027
-#define ID_G_TRANSFERRED 10028
-#define ID_TOTAL_REQUESTS 10029
-#define ID_TOTAL_ACCEPTED_UPLOADS 10030
-#define ID_TOTAL_TRANSFERRED 10031
+#define ID_SHARED_FILES_IMAGE 10017
+#define ID_TXT_SHARED 10018
+#define ID_SHAREDLISTCTRL 10019
+#define ID_CURSES_REQUESTS 10020
+#define ID_CURSES_ACCEPTED_UPLOADS 10021
+#define ID_CURSES_TRANSFERRED 10022
+#define ID_G_REQUESTS 10023
+#define ID_G_UPLOADS 10024
+#define ID_G_TRANSFERRED 10025
+#define ID_TOTAL_REQUESTS 10026
+#define ID_TOTAL_ACCEPTED_UPLOADS 10027
+#define ID_TOTAL_TRANSFERRED 10028
wxSizer *SharedFilesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_FRIEND_IMAGE 10032
-#define ID_LISTCTRL 10033
-#define ID_MESSAGES_IMAGE 10034
-#define ID_NOTEBOOK 10035
+#define ID_FRIEND_IMAGE 10029
+#define ID_LISTCTRL 10030
+#define ID_MESSAGES_IMAGE 10031
+#define ID_NOTEBOOK 10032
wxSizer *MessagesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define BTN_STAT 10036
-#define ID_STATSTREECTRL 10037
-#define ID_FOREIGN 10038
-#define ID_CON_GRAPH 10039
-#define ID_DL_SES 10040
-#define ID_DL_CUR 10041
-#define ID_DL_AVG 10042
-#define ID_DL_GRAPH 10043
-#define ID_UL_SES 10044
-#define ID_UL_CUR 10045
-#define ID_UL_AVG 10046
-#define ID_UL_GRAPH 10047
+#define BTN_STAT 10033
+#define ID_STATSTREECTRL 10034
+#define ID_FOREIGN 10035
+#define ID_CON_GRAPH 10036
+#define ID_DL_SES 10037
+#define ID_DL_CUR 10038
+#define ID_DL_AVG 10039
+#define ID_DL_GRAPH 10040
+#define ID_UL_SES 10041
+#define ID_UL_CUR 10042
+#define ID_UL_AVG 10043
+#define ID_UL_GRAPH 10044
wxSizer *StatisticsWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_LANG 10048
-#define ID_BTN_ADDLANG 10049
-#define ID_BTN_REMOVELANG 10050
-#define ID_ICONSET 10051
-#define ID_BTN_ADDICONSET 10052
-#define ID_BTN_REMOVEICONSET 10053
-#define ID_FONT 10054
-#define ID_STARTPAGE 10055
-#define ID_REMEMBER_LAST 10056
-#define ID_SHOWSPLASH 10057
-#define ID_PROMPTEXIT 10058
-#define ID_SHOWTOOL 10059
-#define ID_TOOLALIGN 10060
-#define ID_SHOWMENU 10061
-#define GUI_OK 10062
-#define GUI_CANCEL 10063
+#define ID_LANG 10045
+#define ID_BTN_ADDLANG 10046
+#define ID_BTN_REMOVELANG 10047
+#define ID_ICONSET 10048
+#define ID_BTN_ADDICONSET 10049
+#define ID_BTN_REMOVEICONSET 10050
+#define ID_FONT 10051
+#define ID_STARTPAGE 10052
+#define ID_REMEMBER_LAST 10053
+#define ID_SHOWSPLASH 10054
+#define ID_PROMPTEXIT 10055
+#define ID_SHOWTOOL 10056
+#define ID_TOOLALIGN 10057
+#define ID_SHOWMENU 10058
+#define GUI_OK 10059
+#define GUI_CANCEL 10060
wxSizer *Dlg_GUI_Settings( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_LOGBOOK 10064
+#define ID_LOGBOOK 10061
wxSizer *Server_Logs( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
extern wxSizer *sizer_updateserver;
-#define ID_BTN_SHOW_UPDATELIST 10065
+#define ID_BTN_SHOW_UPDATELIST 10062
extern wxSizer *sizer_serversettings;
-#define ID_BTN_SHOW_SERVERSETTINGS 10066
+#define ID_BTN_SHOW_SERVERSETTINGS 10063
extern wxSizer *sizer_portsettings;
-#define ID_BTN_SHOW_PORT_OPTIONS 10067
+#define ID_BTN_SHOW_PORT_OPTIONS 10064
extern wxSizer *sizer_addserver;
-#define ID_BTN_SHOW_ADDSERVER 10068
+#define ID_BTN_SHOW_ADDSERVER 10065
extern wxSizer *sizer_logoptions;
-#define ID_BTN_SHOW_LOGGINGOPTIONS 10069
+#define ID_BTN_SHOW_LOGGINGOPTIONS 10066
wxSizer *Server_Sidebar( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_SERVER_IP 10070
-#define ID_SERVERIP 10071
-#define ID_ADDTOLIST 10072
+#define ID_SERVER_IP 10067
+#define ID_SERVERIP 10068
+#define ID_ADDTOLIST 10069
wxSizer *Server_AddServerPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_SERVERLISTURL 10073
-#define ID_UPDATE 10074
+#define ID_SERVERLISTURL 10070
+#define ID_UPDATE 10071
wxSizer *Server_UpdatePanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_SS_AUTO_CONNECT 10075
-#define ID_SS_AC_STATIC_ONLY 10076
-#define ID_LINE 10077
-#define ID_SS_SERVER_IMG 10078
-#define ID_SS_SERVER_NAME 10079
-#define ID_CHECK_SS_STATIC 10080
-#define ID_SS_PRIO 10081
+#define ID_SS_AUTO_CONNECT 10072
+#define ID_SS_AC_STATIC_ONLY 10073
+#define ID_LINE 10074
+#define ID_SS_SERVER_IMG 10075
+#define ID_SS_SERVER_NAME 10076
+#define ID_CHECK_SS_STATIC 10077
+#define ID_SS_PRIO 10078
wxSizer *Server_SettingsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_CHECK_LINE_LIMIT 10082
-#define ID_TXT_LINE_LIMIT 10083
-#define ID_CHECK_SAVE_TO_DISK 10084
-#define ID_BTN_CLEAR_LOGS 10085
+#define ID_CHECK_LINE_LIMIT 10079
+#define ID_TXT_LINE_LIMIT 10080
+#define ID_CHECK_SAVE_TO_DISK 10081
+#define ID_BTN_CLEAR_LOGS 10082
wxSizer *Server_LogOptionsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_LANG_NAME 10086
-#define ID_BTN_ADD_LANG_OK 10087
-#define ID_BTN_ADD_LANG_CANCEL 10088
+#define ID_LANG_NAME 10083
+#define ID_BTN_ADD_LANG_OK 10084
+#define ID_BTN_ADD_LANG_CANCEL 10085
wxSizer *Dlg_AddLanguage( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_CHECKBOX 10089
+#define ID_CHECKBOX 10086
wxSizer *Server_PortSettingsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_BTN_ADDICONSET_OK 10090
-#define ID_BTN_ADDICONSET_CANCEL 10091
+#define ID_BTN_ADDICONSET_OK 10087
+#define ID_BTN_ADDICONSET_CANCEL 10088
wxSizer *Dlg_AddIconSet( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
// Declare menubar functions
@@ -169,7 +164,7 @@
// Declare bitmap functions
-#define ID_NULL_BMP 10092
+#define ID_NULL_BMP 10089
wxBitmap Icons( size_t index );
#endif
Index: wxInterface.wdr
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.wdr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsdUV8Dj and /tmp/cvsC5ztfv differ
|
