Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/mapwindow.cc')
-rw-r--r--src/client/mapwindow.cc21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/client/mapwindow.cc b/src/client/mapwindow.cc
index 3dbb1fb..de49ad9 100644
--- a/src/client/mapwindow.cc
+++ b/src/client/mapwindow.cc
@@ -5,18 +5,23 @@
the terms of the GNU General Public License version 2
*/
-#include "audio/audio.h"
-#include "core/application.h"
-#include "core/entity.h"
-#include "core/entityglobe.h"
#include "client/mapwindow.h"
#include "client/targets.h"
+#include "client/closeiconbutton.h"
+
#include "ui/ui.h"
#include "ui/paint.h"
+
#include "render/gl.h"
#include "render/textures.h"
#include "render/text.h"
+#include "audio/audio.h"
+
+#include "core/application.h"
+#include "core/entity.h"
+#include "core/entityglobe.h"
+
namespace client
{
@@ -82,8 +87,8 @@ MapWindow::MapWindow(ui::Widget *parent) : ui::Window(parent)
mapwindow_maplabel->set_alignment(ui::AlignCenter);
// map buttons
- mapwindow_zonebutton = new ui::IconButton(mapwindow_pane_left, "bitmaps/icons/button_map");
- mapwindow_galaxybutton = new ui::IconButton(mapwindow_pane_left, "bitmaps/icons/button_galaxy");
+ mapwindow_zonebutton = new ui::IconButton(mapwindow_pane_left, "bitmaps/icons/button_map", "Zone map");
+ mapwindow_galaxybutton = new ui::IconButton(mapwindow_pane_left, "bitmaps/icons/button_galaxy", "Galaxy map");
// ---- window title
mapwindow_titlelabel = new ui::Label(this);
@@ -95,10 +100,8 @@ MapWindow::MapWindow(ui::Widget *parent) : ui::Window(parent)
mapwindow_titlelabel->set_text("STAR CHART");
// close button
- mapwindow_closebutton = new ui::IconButton(mapwindow_titlelabel, "bitmaps/icons/window_close");
+ mapwindow_closebutton = new CloseIconButton(mapwindow_titlelabel);
-
-
hide();
}