Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@telenet.be>2020-07-18 17:20:32 +0200
committerStijn Buys <ingar@telenet.be>2020-07-18 17:20:32 +0200
commit41ec4ed68571091f2e2500344a7aeb527a91dc92 (patch)
tree29584f1f2f949e73da749d2e2504799519a1c21a /src/client/inventorywindow.cc
parentb19afea9427dde861c990236ab11e23edfeb267c (diff)
Added standard close button widget class, added tooltips where approriate.
Diffstat (limited to 'src/client/inventorywindow.cc')
-rw-r--r--src/client/inventorywindow.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc
index de27d13..09bd71e 100644
--- a/src/client/inventorywindow.cc
+++ b/src/client/inventorywindow.cc
@@ -6,6 +6,7 @@
#include "core/application.h"
#include "client/inventorywindow.h"
+#include "client/closeiconbutton.h"
#include "ui/label.h"
#include "ui/bitmap.h"
#include "ui/listitem.h"
@@ -63,9 +64,8 @@ InventoryWindow::InventoryWindow(ui::Widget *parent) : ui::Window(parent)
inventorywindow_inventorytext->set_font(ui::root()->font_small());
inventorywindow_inventorytext->set_alignment(ui::AlignLeft | ui::AlignTop);
- inventorywindow_shipbutton = new ui::IconButton(this, "bitmaps/icons/button_ship");
- inventorywindow_ejectbutton = new ui::IconButton(this, "bitmaps/icons/button_eject");
- //inventorywindow_mountbutton = new ui::IconButton(this, "bitmaps/icons/button_mount");
+ inventorywindow_shipbutton = new ui::IconButton(this, "bitmaps/icons/button_ship", "Ship info");
+ inventorywindow_ejectbutton = new ui::IconButton(this, "bitmaps/icons/button_eject", "Eject cargo");
// window title
inventorywindow_titlelabel = new ui::Label(this);
@@ -77,7 +77,7 @@ InventoryWindow::InventoryWindow(ui::Widget *parent) : ui::Window(parent)
inventorywindow_titlelabel->set_text("INVENTORY");
// close button
- inventorywindow_closebutton = new ui::IconButton(inventorywindow_titlelabel, "bitmaps/icons/window_close");
+ inventorywindow_closebutton = new CloseIconButton(inventorywindow_titlelabel);
// eject dialog
inventorywindow_ejectconfirmbutton = new ui::Button(inventorywindow_scrollpane, "Eject");
@@ -146,24 +146,26 @@ void InventoryWindow::update_inventory()
listitem->set_sortkey(sortkey);
if (item->has_flag(core::Item::Mounted)) {
- // unmount button
- ui::IconButton *ismounted_button = new ui::IconButton(listitem, "bitmaps/icons/button_mount");
+ // wepaon is mounted, show the unmount button
+ ui::IconButton *ismounted_button = new ui::IconButton(listitem, "bitmaps/icons/button_unmount");
std::ostringstream strcmd;
strcmd << "remote mount " << item->id();
ismounted_button->set_command(strcmd.str());
ismounted_button->set_background(true);
ismounted_button->set_size(icon_size, icon_size);
ismounted_button->set_location(ui::UI::elementsize.width() - icon_size - padding, padding);
+ ismounted_button->set_tooltip("Unmount weapon");
} else if (item->has_flag(core::Item::Mountable)) {
- // mount button
- ui::IconButton *isunmounted_button = new ui::IconButton(listitem, "bitmaps/icons/button_unmount");
+ // weapon is not mounted, show mount button
+ ui::IconButton *isunmounted_button = new ui::IconButton(listitem, "bitmaps/icons/button_mount");
std::ostringstream strcmd;
strcmd << "remote mount " << item->id();
isunmounted_button->set_command(strcmd.str());
isunmounted_button->set_background(true);
isunmounted_button->set_size(icon_size, icon_size);
isunmounted_button->set_location(ui::UI::elementsize.width() - icon_size - padding, padding);
+ isunmounted_button->set_tooltip("Mount weapon");
}
// preserve previous selection during update