[Widelands-cvs] SF.net SVN: widelands:[3620] trunk/src/ui
Status: Beta
Brought to you by:
sirver
Menu
▾
▴
[Widelands-cvs] SF.net SVN: widelands:[3620] trunk/src/ui
|
From: <si...@us...> - 2008-12-18 17:53:23
|
Revision: 3620
http://widelands.svn.sourceforge.net/widelands/?rev=3620&view=rev
Author: sigra
Date: 2008-12-18 17:53:12 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Remove duplicated members m_xres and m_yres.
Modified Paths:
--------------
trunk/src/ui/ui_basic/ui_table.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_intro.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_main.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_main.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_options.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_options.h
trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.cc
trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.h
Modified: trunk/src/ui/ui_basic/ui_table.h
===================================================================
--- trunk/src/ui/ui_basic/ui_table.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_basic/ui_table.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -172,7 +172,7 @@
void set_font(std::string const & fontname, int32_t fontsize) {
m_fontname = fontname;
m_fontsize = fontsize;
- m_headerheight = fontsize*1.2;
+ m_headerheight = fontsize * 6 / 5;
}
void sort
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_base.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -43,11 +43,10 @@
* Args: bgpic name of the background picture
*/
Fullscreen_Menu_Base::Fullscreen_Menu_Base(const char *bgpic)
- : UI::Panel(0, 0, 0, gr_x(), gr_y())
-{
+ : UI::Panel(0, 0, 0, gr_x(), gr_y()),
// Switch graphics mode if necessary
- m_xres = gr_x();
- m_yres = gr_y();
+ m_xres(gr_x()), m_yres(gr_y())
+{
Section *s = g_options.pull_section("global");
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_base.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -49,9 +49,10 @@
///\return the current set UI font
std::string ui_fn();
-private:
+protected:
uint32_t m_xres;
uint32_t m_yres;
+private:
uint32_t m_pic_background;
uint32_t m_res_background;
};
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -38,10 +38,6 @@
Fullscreen_Menu_Base("choosemapmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
@@ -52,7 +48,8 @@
(ui_fn()),
// Text labels
-title (this, m_xres/2, m_yres * 9 / 50, _("Select a campaign"), Align_HCenter),
+title
+ (this, m_xres / 2, m_yres * 9 / 50, _("Select a campaign"), Align_HCenter),
label_campname (this, m_xres * 3 / 5, m_yres * 17 / 50, _("Campaign:")),
tacampname (this, m_xres * 61 / 100, m_yres * 3 / 8, ""),
label_difficulty (this, m_xres * 3 / 5, m_yres * 17 / 40, _("Difficulty:")),
@@ -267,7 +264,7 @@
(ui_fn()),
// Text labels
-title(this, m_xres/2, m_yres * 9 / 50, _("Choose your map!"), Align_HCenter),
+title(this, m_xres / 2, m_yres * 9 / 50, _("Choose your map!"), Align_HCenter),
label_mapname (this, m_xres * 3 / 5, m_yres * 17 / 50, _("Name:")),
tamapname (this, m_xres * 61 / 100, m_yres * 3 / 8, ""),
label_author (this, m_xres * 3 / 5, m_yres * 17 / 40, _("Author:")),
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_campaign_select.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -45,8 +45,6 @@
int32_t get_campaign();
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -26,16 +26,12 @@
Fullscreen_Menu_Base("singleplmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres * 7 / 20),
m_buth
(m_yres * 19 / 400),
m_butx
- ((m_xres-m_butw)/2),
+ ((m_xres - m_butw) / 2),
// Title
title(this, m_xres / 2, m_yres * 3 / 40, _("Editor Menu"), Align_HCenter),
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_editor.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -35,8 +35,6 @@
enum {Back = dying_code, New_Map, Load_Map};
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_butx;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -41,10 +41,6 @@
Fullscreen_Menu_Base("choosemapmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_editor_mapselect.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -39,8 +39,6 @@
void double_clicked(uint32_t);
void fill_list();
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -29,12 +29,6 @@
:
Fullscreen_Menu_Base("fileviewmenu.jpg"),
-// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
-
// Title
title (this, m_xres * 3 / 50, m_yres / 10, std::string(), Align_Left),
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_fileview.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -42,9 +42,6 @@
void set_text(const std::string & text);
private:
- uint32_t m_xres;
- uint32_t m_yres;
-
UI::Textarea title;
UI::Multiline_Textarea textview;
UI::IDButton<Fullscreen_Menu_TextView, int32_t> close_button;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_intro.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_intro.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_intro.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -28,11 +28,11 @@
// Text area
m_message
(this,
- gr_x()/2, gr_y() * 19 / 20,
+ gr_x() / 2, gr_y() * 19 / 20,
_("Press a key or click to continue ..."),
Align_HCenter)
{
- m_message.set_font(ui_fn(), fs_small()*1.2, RGBColor(192, 192, 128));
+ m_message.set_font(ui_fn(), fs_small() * 6 / 5, RGBColor(192, 192, 128));
}
bool Fullscreen_Menu_Intro::handle_mousepress(const Uint8, int32_t, int32_t) {
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -41,10 +41,6 @@
Fullscreen_Menu_Base("launchgamemenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_launchgame.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -71,8 +71,6 @@
void load_previous_playerdata();
void enable_all_pdgs();
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -33,10 +33,6 @@
Fullscreen_Menu_Base("choosemapmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_loadgame.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -50,8 +50,6 @@
void fill_list ();
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -32,10 +32,6 @@
Fullscreen_Menu_Base("choosemapmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_loadreplay.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -43,8 +43,6 @@
void fill_list();
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_main.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_main.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_main.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -27,10 +27,6 @@
Fullscreen_Menu_Base("mainmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butx
(m_xres * 13 / 40),
m_butw
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_main.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_main.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_main.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -42,8 +42,6 @@
mm_exit
};
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butx;
uint32_t m_butw;
uint32_t m_buth;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -43,10 +43,6 @@
Fullscreen_Menu_Base("choosemapmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres / 4),
m_buth
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_mapselect.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -66,8 +66,6 @@
void double_clicked(uint32_t);
void fill_list();
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_fs;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -29,10 +29,6 @@
Fullscreen_Menu_Base("singleplmenu.jpg"), // change this
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butx
(m_xres * 13 / 40),
m_butw
@@ -49,7 +45,7 @@
// Text labels
title
(this,
- m_xres/2, m_yres / 10,
+ m_xres / 2, m_yres / 10,
_("Begin Network Game"), Align_HCenter),
m_opengames
(this,
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_netsetup.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -61,8 +61,6 @@
const std::string& get_playername();
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butx;
uint32_t m_butw;
uint32_t m_buth;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_options.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_options.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_options.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -39,10 +39,6 @@
Fullscreen_Menu_Base("optionsmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_vbutw
(m_yres * 333 / 10000),
m_butw
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_options.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_options.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_options.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -81,8 +81,6 @@
};
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_vbutw;
uint32_t m_butw;
uint32_t m_buth;
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.cc
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.cc 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.cc 2008-12-18 17:53:12 UTC (rev 3620)
@@ -26,10 +26,6 @@
Fullscreen_Menu_Base("singleplmenu.jpg"),
// Values for alignment and size
-m_xres
- (gr_x()),
-m_yres
- (gr_y()),
m_butw
(m_xres * 7 / 20),
m_buth
@@ -44,7 +40,7 @@
// Title
title
(this,
- m_xres/2, m_yres * 3 / 40,
+ m_xres / 2, m_yres * 3 / 40,
_("Single Player Menu"), Align_HCenter),
// Buttons
Modified: trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.h
===================================================================
--- trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.h 2008-12-18 17:35:39 UTC (rev 3619)
+++ trunk/src/ui/ui_fs_menus/fullscreen_menu_singleplayer.h 2008-12-18 17:53:12 UTC (rev 3620)
@@ -35,8 +35,6 @@
enum {Back = dying_code, New_Game, Campaign, Load_Game};
private:
- uint32_t m_xres;
- uint32_t m_yres;
uint32_t m_butw;
uint32_t m_buth;
uint32_t m_butx;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|