Menu
▾
▴
sharedaemon-cvs
|
From: <ma...@us...> - 2003-11-27 10:01:58
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1586
Modified Files:
Images.cpp MainDlg.cpp
Log Message:
All image formats are now supported (filenames hardcoded still tho), toolbar background colour hardcoded to `WHEAT`, font to wxDECORATIVE (both will be userconfigurable later). Using same toolbar code on all platforms now.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Images.cpp 27 Nov 2003 08:23:11 -0000 1.21
+++ Images.cpp 27 Nov 2003 10:01:54 -0000 1.22
@@ -98,48 +98,48 @@
path.Prepend(wxT("::Resources"));
#endif
- images.Append(wxT("friend"), new wxBitmap(path+wxT("friend.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("messages"), new wxBitmap(path+wxT("messages.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("searchresults"), new wxBitmap(path+wxT("searchresults.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("provider"), new wxBitmap(path+wxT("provider.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("serverlist"), new wxBitmap(path+wxT("serverlist.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("newserver"), new wxBitmap(path+wxT("newserver.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("updateservers"), new wxBitmap(path+wxT("updateservers.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("info"), new wxBitmap(path+wxT("info.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("serverinfo"), new wxBitmap(path+wxT("serverinfo.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("log"), new wxBitmap(path+wxT("log.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("sharedfiles"), new wxBitmap(path+wxT("sharedfiles.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("updown11"), new wxBitmap(path+wxT("updown11.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("updown00"), new wxBitmap(path+wxT("updown00.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("connectedhigh"), new wxBitmap(path+wxT("connectedhigh.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("disconnected"), new wxBitmap(path+wxT("disconnected.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("clock"), new wxBitmap(path+wxT("clock.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("user"), new wxBitmap(path+wxT("user.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("server"), new wxBitmap(path+wxT("server.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("arrow"), new wxBitmap(path+wxT("arrow.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("statistics"), new wxBitmap(path+wxT("statistics.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("upload"), new wxBitmap(path+wxT("upload.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("download"), new wxBitmap(path+wxT("download.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("partstats"), new wxBitmap(path+wxT("partstats.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("fullstats"), new wxBitmap(path+wxT("fullstats.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("exclamation"), new wxBitmap(path+wxT("exclamation.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("connection"), new wxBitmap(path+wxT("connection.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("daily"), new wxBitmap(path+wxT("daily.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("monthly"), new wxBitmap(path+wxT("monthly.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("yearly"), new wxBitmap(path+wxT("yearly.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("mule"), new wxBitmap(path+wxT("mule.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_connect"), new wxBitmap(path+wxT("btn_connect.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_servers"), new wxBitmap(path+wxT("btn_servers.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_transfer"), new wxBitmap(path+wxT("btn_transfer.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_search"), new wxBitmap(path+wxT("btn_search.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_shared"), new wxBitmap(path+wxT("btn_shared.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_messages"), new wxBitmap(path+wxT("btn_messages.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_statistics"), new wxBitmap(path+wxT("btn_statistics.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_guisettings"), new wxBitmap(path+wxT("btn_guisettings.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("btn_preferences"), new wxBitmap(path+wxT("btn_preferences.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("splashscreen"), new wxBitmap(path+wxT("splashscreen.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("leftarrow"), new wxBitmap(path+wxT("leftarrow.png"), wxBITMAP_TYPE_PNG));
- images.Append(wxT("rightarrow"), new wxBitmap(path+wxT("rightarrow.png"), wxBITMAP_TYPE_PNG));
+ images.Append(wxT("friend"), new wxBitmap(path+wxT("friend.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("messages"), new wxBitmap(path+wxT("messages.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("searchresults"), new wxBitmap(path+wxT("searchresults.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("provider"), new wxBitmap(path+wxT("provider.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("serverlist"), new wxBitmap(path+wxT("serverlist.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("newserver"), new wxBitmap(path+wxT("newserver.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("updateservers"), new wxBitmap(path+wxT("updateservers.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("info"), new wxBitmap(path+wxT("info.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("serverinfo"), new wxBitmap(path+wxT("serverinfo.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("log"), new wxBitmap(path+wxT("log.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("sharedfiles"), new wxBitmap(path+wxT("sharedfiles.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("updown11"), new wxBitmap(path+wxT("updown11.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("updown00"), new wxBitmap(path+wxT("updown00.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("connectedhigh"), new wxBitmap(path+wxT("connectedhigh.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("disconnected"), new wxBitmap(path+wxT("disconnected.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("clock"), new wxBitmap(path+wxT("clock.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("user"), new wxBitmap(path+wxT("user.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("server"), new wxBitmap(path+wxT("server.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("arrow"), new wxBitmap(path+wxT("arrow.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("statistics"), new wxBitmap(path+wxT("statistics.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("upload"), new wxBitmap(path+wxT("upload.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("download"), new wxBitmap(path+wxT("download.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("partstats"), new wxBitmap(path+wxT("partstats.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("fullstats"), new wxBitmap(path+wxT("fullstats.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("exclamation"), new wxBitmap(path+wxT("exclamation.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("connection"), new wxBitmap(path+wxT("connection.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("daily"), new wxBitmap(path+wxT("daily.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("monthly"), new wxBitmap(path+wxT("monthly.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("yearly"), new wxBitmap(path+wxT("yearly.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("mule"), new wxBitmap(path+wxT("mule.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_connect"), new wxBitmap(path+wxT("btn_connect.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_servers"), new wxBitmap(path+wxT("btn_servers.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_transfer"), new wxBitmap(path+wxT("btn_transfer.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_search"), new wxBitmap(path+wxT("btn_search.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_shared"), new wxBitmap(path+wxT("btn_shared.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_messages"), new wxBitmap(path+wxT("btn_messages.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_statistics"), new wxBitmap(path+wxT("btn_statistics.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_guisettings"), new wxBitmap(path+wxT("btn_guisettings.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("btn_preferences"), new wxBitmap(path+wxT("btn_preferences.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("splashscreen"), new wxBitmap(path+wxT("splashscreen.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("leftarrow"), new wxBitmap(path+wxT("leftarrow.png"), wxBITMAP_TYPE_ANY));
+ images.Append(wxT("rightarrow"), new wxBitmap(path+wxT("rightarrow.png"), wxBITMAP_TYPE_ANY));
}
/**
@@ -154,7 +154,7 @@
void CImages::MakeToolImages() {
wxBitmap tmp, tmp_new;
wxMemoryDC mdc;
- wxCoord x, y, width = 0;
+ wxCoord x, y, width = 0, height = 0;
wxArrayString btntxt;
/* List of button names */
@@ -178,71 +178,74 @@
}
tool_img_width = width+6;
- mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
- mdc.SetPen(*wxTRANSPARENT_PEN);
+ width = width+6;
+ height = y+36;
- tmp_new = wxBitmap(width+6, y+36);
+ mdc.SetBrush(wxBrush(*wxTheColourDatabase->FindColour(wxT("WHEAT")), wxSOLID));
+ mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
+
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_connect")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(0), &x, &y);
- mdc.DrawText(btntxt.Item(0), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(0), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_connect")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_servers")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(1), &x, &y);
- mdc.DrawText(btntxt.Item(1), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(1), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_servers")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_search")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(2), &x, &y);
- mdc.DrawText(btntxt.Item(2), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(2), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_search"))= tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_transfer")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(3), &x, &y);
- mdc.DrawText(btntxt.Item(3), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(3), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_transfer")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_shared")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(4), &x, &y);
- mdc.DrawText(btntxt.Item(4), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(4), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_shared")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_messages")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(5), &x, &y);
- mdc.DrawText(btntxt.Item(5), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(5), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_messages")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_statistics")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(6), &x, &y);
- mdc.DrawText(btntxt.Item(6), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(6), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_statistics")) = tmp_new;
- tmp_new = wxBitmap(width+6, y+36);
+ tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
mdc.DrawBitmap(GetImage(wxT("btn_guisettings")), (tmp_new.GetWidth()-32)/2, 2, true);
mdc.GetTextExtent(btntxt.Item(7), &x, &y);
- mdc.DrawText(btntxt.Item(7), (tmp_new.GetWidth()-x)/2, 34);
+ mdc.DrawText(btntxt.Item(7), (tmp_new.GetWidth()-x)/2, 36);
GetImage(wxT("btn_guisettings")) = tmp_new;
}
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MainDlg.cpp 27 Nov 2003 08:23:11 -0000 1.14
+++ MainDlg.cpp 27 Nov 2003 10:01:54 -0000 1.15
@@ -112,11 +112,6 @@
/* Load dialog pages */
LoadAndShowDialogPages();
- /* Generate toolbar images if needed */
- #if !defined(__WXGTK__)
- img->MakeToolImages();
- #endif
-
/**
* Toolbar and Menubar must be created AFTER loading dialog pages,
* since they do calls to GetCurPage() which results in crash
@@ -241,10 +236,10 @@
wxToolBar *tb = new wxToolBar(
this, -1, wxDefaultPosition, wxDefaultSize,
tool_align|wxNO_BORDER|wxTB_3DBUTTONS|wxTB_FLAT
- #if defined(__WXGTK__)
- |wxTB_TEXT
- #endif
);
+
+ /* Generate toolbar images */
+ img->MakeToolImages();
tb->SetToolBitmapSize(wxSize(img->tool_img_width, 52));
tb->SetMargins(2, 2);
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X