[SCM] Development for GoFind! branch, master, updated. 1d05de3ffc3e14db4b7707c9e6c94ed1206fb7ec
Miriam Ruiz
miriam at debian.org
Sat May 9 17:41:51 UTC 2009
The following commit has been merged in the master branch:
commit 1d05de3ffc3e14db4b7707c9e6c94ed1206fb7ec
Author: Miriam Ruiz <miriam at debian.org>
Date: Sat May 9 19:47:48 2009 +0200
Minimal size in FLTK is now 710x400 instead of 710x500 for supporting Asus EEE Computers (800x480)
diff --git a/fltk/ui.cpp b/fltk/ui.cpp
index 46234ce..8f21306 100644
--- a/fltk/ui.cpp
+++ b/fltk/ui.cpp
@@ -1593,7 +1593,7 @@ static const int vgap = 4;
static const int hgap = 6;
if (w < 710) w = 710;
-if (h < 500) h = 500;
+if (h < 400) h = 400;
int x_ref = w - 320 - border;
int h_info_tags = (h - 240 - border * 2 - vgap * 2);
@@ -1623,7 +1623,7 @@ void GamesUI::Screenshot(Fl_Image *img) {
}
MainWindow* GamesUI::CreateMainWindow() {
- { Window = new MainWindow(710, 525);
+ { Window = new MainWindow(710, 400);
Window->box(FL_FLAT_BOX);
Window->color(FL_BACKGROUND_COLOR);
Window->selection_color(FL_BACKGROUND_COLOR);
@@ -1634,52 +1634,52 @@ MainWindow* GamesUI::CreateMainWindow() {
Window->user_data((void*)(this));
Window->align(FL_ALIGN_TOP);
Window->when(FL_WHEN_RELEASE);
- { InputGroup = new Fl_Group(5, 16, 375, 118);
+ { InputGroup = new Fl_Group(5, 5, 375, 118);
InputGroup->box(FL_UP_FRAME);
- { SearchInput = new Fl_Input(65, 95, 300, 25, _("Search"));
+ { SearchInput = new Fl_Input(65, 86, 300, 25, _("Search"));
SearchInput->labelsize(12);
} // Fl_Input* SearchInput
- { TypeSelection = new Fl_Choice(70, 60, 120, 25, _("Type"));
+ { TypeSelection = new Fl_Choice(70, 51, 120, 25, _("Type"));
TypeSelection->down_box(FL_BORDER_BOX);
TypeSelection->labelsize(12);
TypeSelection->when(FL_WHEN_CHANGED);
TypeSelection->menu(menu_TypeSelection);
} // Fl_Choice* TypeSelection
- { InterfaceSelection = new Fl_Choice(260, 60, 115, 25, _("Interface"));
+ { InterfaceSelection = new Fl_Choice(260, 51, 115, 25, _("Interface"));
InterfaceSelection->down_box(FL_BORDER_BOX);
InterfaceSelection->labelsize(12);
InterfaceSelection->menu(menu_InterfaceSelection);
} // Fl_Choice* InterfaceSelection
- { Fl_Group* o = new Fl_Group(13, 25, 312, 30);
- { AlreadyInstalled = new Fl_Round_Button(13, 28, 110, 20, _("Already installed"));
+ { Fl_Group* o = new Fl_Group(13, 16, 312, 30);
+ { AlreadyInstalled = new Fl_Round_Button(13, 19, 110, 20, _("Already installed"));
AlreadyInstalled->down_box(FL_ROUND_DOWN_BOX);
AlreadyInstalled->labelsize(12);
} // Fl_Round_Button* AlreadyInstalled
- { ToBeInstalled = new Fl_Round_Button(138, 28, 110, 20, _("To be installed"));
+ { ToBeInstalled = new Fl_Round_Button(138, 19, 110, 20, _("To be installed"));
ToBeInstalled->down_box(FL_ROUND_DOWN_BOX);
ToBeInstalled->labelsize(12);
} // Fl_Round_Button* ToBeInstalled
- { InstalledOrNot = new Fl_Round_Button(251, 28, 65, 20, _("Both"));
+ { InstalledOrNot = new Fl_Round_Button(251, 19, 65, 20, _("Both"));
InstalledOrNot->down_box(FL_ROUND_DOWN_BOX);
InstalledOrNot->value(1);
InstalledOrNot->labelsize(12);
} // Fl_Round_Button* InstalledOrNot
o->end();
} // Fl_Group* o
- { Fl_Button* o = new Fl_Button(340, 20, 35, 35);
+ { Fl_Button* o = new Fl_Button(340, 11, 35, 35);
o->box(FL_NO_BOX);
o->image(image_Icon32);
o->callback((Fl_Callback*)cb_);
} // Fl_Button* o
InputGroup->end();
} // Fl_Group* InputGroup
- { ScreenshotWidget = new Fl_Button(385, 15, 320, 240);
+ { ScreenshotWidget = new Fl_Button(385, 5, 320, 240);
ScreenshotWidget->box(FL_FLAT_BOX);
ScreenshotWidget->color(FL_GRAY0);
ScreenshotWidget->selection_color(FL_GRAY0);
ScreenshotWidget->callback((Fl_Callback*)cb_ScreenshotWidget);
} // Fl_Button* ScreenshotWidget
- { ResultsBrowser = new PackageBrowser(5, 140, 375, 375);
+ { ResultsBrowser = new PackageBrowser(5, 130, 375, 265);
ResultsBrowser->type(2);
ResultsBrowser->box(FL_NO_BOX);
ResultsBrowser->color(FL_BACKGROUND2_COLOR);
@@ -1692,7 +1692,7 @@ MainWindow* GamesUI::CreateMainWindow() {
ResultsBrowser->align(FL_ALIGN_CENTER);
ResultsBrowser->when(FL_WHEN_RELEASE_ALWAYS);
} // PackageBrowser* ResultsBrowser
- { DebTagsBrowser = new VersatileBrowser(385, 435, 320, 80);
+ { DebTagsBrowser = new VersatileBrowser(385, 335, 320, 60);
DebTagsBrowser->box(FL_NO_BOX);
DebTagsBrowser->color(FL_BACKGROUND2_COLOR);
DebTagsBrowser->selection_color(FL_SELECTION_COLOR);
@@ -1704,7 +1704,7 @@ MainWindow* GamesUI::CreateMainWindow() {
DebTagsBrowser->align(FL_ALIGN_CENTER);
DebTagsBrowser->when(FL_WHEN_RELEASE_ALWAYS);
} // VersatileBrowser* DebTagsBrowser
- { InfoView = new HTMLView(385, 260, 320, 170);
+ { InfoView = new HTMLView(385, 250, 320, 80);
InfoView->box(FL_NO_BOX);
InfoView->color(FL_BACKGROUND2_COLOR);
InfoView->selection_color(FL_SELECTION_COLOR);
@@ -1718,14 +1718,14 @@ MainWindow* GamesUI::CreateMainWindow() {
Window->end();
Window->resizable(Window);
} // MainWindow* Window
- Window->size_range(710, 500);
+ Window->size_range(710, 400);
return Window;
}
Fl_Double_Window* GamesUI::CreateAboutWindow() {
- { AboutWindow = new Fl_Double_Window(520, 430);
+ { AboutWindow = new Fl_Double_Window(520, 400);
AboutWindow->user_data((void*)(this));
- { AboutView = new HTMLView(5, 75, 510, 350);
+ { AboutView = new HTMLView(5, 75, 510, 320);
AboutView->box(FL_NO_BOX);
AboutView->color(FL_BACKGROUND2_COLOR);
AboutView->selection_color(FL_SELECTION_COLOR);
diff --git a/fltk/ui.fld b/fltk/ui.fld
index 117dbf5..7c55aa8 100644
--- a/fltk/ui.fld
+++ b/fltk/ui.fld
@@ -31,14 +31,14 @@ class GamesUI {open
delete i;
}} {}
}
- Function {Resize(int w, int h)} {open selected return_type void
+ Function {Resize(int w, int h)} {open return_type void
} {
code {static const int border = 6;
static const int vgap = 4;
static const int hgap = 6;
if (w < 710) w = 710;
-if (h < 500) h = 500;
+if (h < 400) h = 400;
int x_ref = w - 320 - border;
int h_info_tags = (h - 240 - border * 2 - vgap * 2);
@@ -69,19 +69,19 @@ if (DebTagsBrowser)
Function {CreateMainWindow()} {open
} {
Fl_Window Window {open
- xywh {383 67 710 525} type Single resizable
+ xywh {549 85 710 400} type Single resizable
class MainWindow visible
} {
Fl_Group InputGroup {open
- xywh {5 16 375 118} box UP_FRAME
+ xywh {5 5 375 118} box UP_FRAME
} {
Fl_Input SearchInput {
label Search
- xywh {65 95 300 25} labelsize 12
+ xywh {65 86 300 25} labelsize 12
}
Fl_Choice TypeSelection {
label Type open
- xywh {70 60 120 25} down_box BORDER_BOX labelsize 12 when 1
+ xywh {70 51 120 25} down_box BORDER_BOX labelsize 12 when 1
} {
MenuItem {} {
label {Any type}
@@ -90,7 +90,7 @@ if (DebTagsBrowser)
}
Fl_Choice InterfaceSelection {
label Interface open
- xywh {260 60 115 25} down_box BORDER_BOX labelsize 12
+ xywh {260 51 115 25} down_box BORDER_BOX labelsize 12
} {
MenuItem {} {
label {Any interface}
@@ -98,54 +98,55 @@ if (DebTagsBrowser)
}
}
Fl_Group {} {open
- xywh {13 25 312 30}
+ xywh {13 16 312 30}
} {
Fl_Round_Button AlreadyInstalled {
label {Already installed}
- xywh {13 28 110 20} down_box ROUND_DOWN_BOX labelsize 12
+ xywh {13 19 110 20} down_box ROUND_DOWN_BOX labelsize 12
}
Fl_Round_Button ToBeInstalled {
label {To be installed}
- xywh {138 28 110 20} down_box ROUND_DOWN_BOX labelsize 12
+ xywh {138 19 110 20} down_box ROUND_DOWN_BOX labelsize 12
}
Fl_Round_Button InstalledOrNot {
label Both
- xywh {251 28 65 20} down_box ROUND_DOWN_BOX value 1 labelsize 12
+ xywh {251 19 65 20} down_box ROUND_DOWN_BOX value 1 labelsize 12
}
}
Fl_Button {} {
callback {AboutWindow->show();}
- image {data/icons/Icon32.png} xywh {340 20 35 35} box NO_BOX
+ image {data/icons/Icon32.png} xywh {340 11 35 35} box NO_BOX
}
}
Fl_Button ScreenshotWidget {
callback {ResultsBrowser->ExternalBrowserScreenshot();}
- xywh {385 15 320 240} box FLAT_BOX color 32 selection_color 32
+ xywh {385 5 320 240} box FLAT_BOX color 32 selection_color 32
}
Fl_Browser ResultsBrowser {
- xywh {5 140 375 375} type Hold align 0 textsize 12
+ xywh {5 130 375 265} type Hold align 0 textsize 12
class PackageBrowser
}
Fl_Browser DebTagsBrowser {
- xywh {385 435 320 80} align 0 textsize 11
+ xywh {385 335 320 60} align 0 textsize 11
class VersatileBrowser
}
Fl_Help_View InfoView {
- xywh {385 260 320 170}
+ xywh {385 250 320 80}
class HTMLView
}
}
- code {Window->size_range(710, 500);} {}
+ code {Window->size_range(710, 400);} {selected
+ }
}
decl {void *user_data;} {public
}
Function {CreateAboutWindow()} {open
} {
Fl_Window AboutWindow {open
- xywh {601 318 520 430} type Double visible
+ xywh {717 70 520 400} type Double visible
} {
Fl_Help_View AboutView {
- xywh {5 75 510 350}
+ xywh {5 75 510 320}
class HTMLView
}
Fl_Button AboutStar {
--
Development for GoFind!
More information about the Pkg-games-commits
mailing list