------------------------------------------------------------
revno: 2327
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Fri 2010-12-03 19:27:30 +0100
message:
Better looking settings dialog
modified:
changelog.txt
win32/HubFrame.cpp
win32/PropPage.cpp
win32/SettingsDialog.cpp
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'changelog.txt'
--- changelog.txt 2010-12-03 17:26:12 +0000
+++ changelog.txt 2010-12-03 18:27:30 +0000
@@ -45,9 +45,10 @@
* [L#250149] Retry on more possible Coral errors (emtee)
* [L#260748] Really readded sfv check (was broken by segmented downloading) (emtee)
* Update bzip2 to version 1.0.6
-* Repurpose blue user icons to identify users with great protocol support (poy)
+* Repurpose blue user icons to identify users with great ADC protocol support (poy)
* [ADC] Dispatch the amount of free slots with INF FS (poy)
-* Repurpose passive user icons to mean "no free slot" (poy)
+* Repurpose passive user icons to mean "no free slot" (when INF FS is available) (poy)
+* [L#534242] Better looking settings dialog (fleetcommand, poy)
-- 0.770 2010-07-05 --
* [L#550300] Catch more potential file corruptions (thanks bigmuscle)
=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp 2010-12-03 17:26:12 +0000
+++ win32/HubFrame.cpp 2010-12-03 18:27:30 +0000
@@ -705,13 +705,14 @@
int HubFrame::UserInfo::getImage() const {
int image = identity.isOp() ? IMAGE_OP : IMAGE_USER;
- if(identity.supports(AdcHub::ADCS_FEATURE) && identity.supports(AdcHub::SEGA_FEATURE) &&
+ string freeSlots = identity.get("FS");
+
+ if(!freeSlots.empty() && identity.supports(AdcHub::ADCS_FEATURE) && identity.supports(AdcHub::SEGA_FEATURE) &&
((identity.supports(AdcHub::TCP4_FEATURE) && identity.supports(AdcHub::UDP4_FEATURE)) || identity.supports(AdcHub::NAT0_FEATURE)))
{
image += 2;
}
- string freeSlots = identity.get("FS");
if(!freeSlots.empty() && Util::toUInt(freeSlots) == 0) {
image += 4;
}
=== modified file 'win32/PropPage.cpp'
--- win32/PropPage.cpp 2010-07-10 14:36:48 +0000
+++ win32/PropPage.cpp 2010-12-03 18:27:30 +0000
@@ -26,7 +26,9 @@
#include "WinUtil.h"
PropPage::PropPage(dwt::Widget* parent) : dwt::ModelessDialog(parent) {
- create();
+ Seed seed;
+ seed.exStyle |= WS_EX_STATICEDGE;
+ create(seed);
}
PropPage::~PropPage() {
=== modified file 'win32/SettingsDialog.cpp'
--- win32/SettingsDialog.cpp 2010-08-29 13:02:34 +0000
+++ win32/SettingsDialog.cpp 2010-12-03 18:27:30 +0000
@@ -55,7 +55,7 @@
}
int SettingsDialog::run() {
- create(Seed(dwt::Point(660, 540), DS_CONTEXTHELP));
+ create(Seed(dwt::Point(680, 560), DS_CONTEXTHELP));
return show();
}
@@ -77,6 +77,7 @@
setHelpId(IDH_INDEX);
grid = addChild(Grid::Seed(3, 1));
+ grid->setSpacing(8);
grid->row(0).mode = GridInfo::FILL;
grid->row(0).align = GridInfo::STRETCH;
@@ -84,6 +85,7 @@
{
GridPtr cur = grid->addChild(Grid::Seed(1, 2));
+ cur->setSpacing(8);
cur->row(0).mode = GridInfo::FILL;
cur->row(0).align = GridInfo::STRETCH;
@@ -92,9 +94,13 @@
cur->column(0).mode = GridInfo::STATIC;
cur->column(1).mode = GridInfo::FILL;
- tree = cur->addChild(Tree::Seed());
- tree->setHelpId(IDH_SETTINGS_TREE);
- tree->onSelectionChanged(std::bind(&SettingsDialog::handleSelectionChanged, this));
+ {
+ auto seed = Tree::Seed();
+ seed.style |= WS_BORDER;
+ tree = cur->addChild(seed);
+ tree->setHelpId(IDH_SETTINGS_TREE);
+ tree->onSelectionChanged(std::bind(&SettingsDialog::handleSelectionChanged, this));
+ }
addPage(T_("Personal information"), cur, new GeneralPage(cur));
@@ -138,6 +144,7 @@
{
GridPtr cur = grid->addChild(Grid::Seed(1, 3));
+ cur->setSpacing(8);
cur->column(0).mode = GridInfo::FILL;
cur->column(0).align = GridInfo::BOTTOM_RIGHT;
@@ -249,5 +256,5 @@
void SettingsDialog::layout() {
dwt::Point sz = getClientSize();
- grid->layout(dwt::Rectangle(3, 3, sz.x - 6, sz.y - 6));
+ grid->layout(dwt::Rectangle(8, 8, sz.x - 16, sz.y - 16));
}
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
