[Freeciv-commits] r34668 - in /trunk/client/gui-qt: mapctrl.cpp shortcuts.cpp shortcuts.h

[mlewczuk80]

Author: mir3x
Date: Fri Dec  2 09:18:26 2016
New Revision: 34668

URL: http://svn.gna.org/viewcvs/freeciv?rev=34668&view=rev
Log:
Qt client - added shortcuts to reload theme and tileset

See patch #8036


Modified:
    trunk/client/gui-qt/mapctrl.cpp
    trunk/client/gui-qt/shortcuts.cpp
    trunk/client/gui-qt/shortcuts.h

Modified: trunk/client/gui-qt/mapctrl.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapctrl.cpp?rev=34668&r1=34667&r2=34668&view=diff
==============================================================================
--- trunk/client/gui-qt/mapctrl.cpp     (original)
+++ trunk/client/gui-qt/mapctrl.cpp     Fri Dec  2 09:18:26 2016
@@ -335,6 +335,18 @@
       return;
     }
 
+    sc = fc_shortcuts::sc()->get_shortcut(SC_RELOAD_THEME);
+    if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
+      qtg_gui_load_theme(QString().toLocal8Bit().data(),
+                         gui_options.gui_qt_default_theme_name);
+      return;
+    }
+
+    sc = fc_shortcuts::sc()->get_shortcut(SC_RELOAD_TILESET);
+    if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
+      tilespec_reread(tileset_basename(tileset), true);
+      return;
+    }
     sc = fc_shortcuts::sc()->get_shortcut(SC_HIDE_WORKERS);
     if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
       key_city_overlay(pos.x(), pos.y());

Modified: trunk/client/gui-qt/shortcuts.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/shortcuts.cpp?rev=34668&r1=34667&r2=34668&view=diff
==============================================================================
--- trunk/client/gui-qt/shortcuts.cpp   (original)
+++ trunk/client/gui-qt/shortcuts.cpp   Fri Dec  2 09:18:26 2016
@@ -50,7 +50,7 @@
   RESPONSE_SAVE
 };
 
-static int num_shortcuts = 47;
+static int num_shortcuts = 49;
 fc_shortcut default_shortcuts[] = {
   {SC_SCROLL_MAP, 0, Qt::RightButton, Qt::NoModifier, "Scroll map" },
   {SC_CENTER_VIEW, Qt::Key_C, Qt::AllButtons, Qt::NoModifier,
@@ -143,7 +143,11 @@
   {SC_PARADROP, Qt::Key_P, Qt::AllButtons, Qt::NoModifier,
     _("Paradrop/clean pollution") },
   {SC_POPUP_COMB_INF, Qt::Key_F1, Qt::AllButtons, Qt::ControlModifier,
-    _("Popup combat information") }
+    _("Popup combat information") },
+  {SC_RELOAD_THEME, Qt::Key_F5, Qt::AllButtons, Qt::ControlModifier
+     | Qt::ShiftModifier, _("Reload theme") },
+  {SC_RELOAD_TILESET, Qt::Key_F6, Qt::AllButtons, Qt::ControlModifier
+    | Qt::ShiftModifier, _("Reload tileset") }
 };
 
 

Modified: trunk/client/gui-qt/shortcuts.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/shortcuts.h?rev=34668&r1=34667&r2=34668&view=diff
==============================================================================
--- trunk/client/gui-qt/shortcuts.h     (original)
+++ trunk/client/gui-qt/shortcuts.h     Fri Dec  2 09:18:26 2016
@@ -77,7 +77,9 @@
   SC_IFACE_LOCK = 44,
   SC_AUTOMATE = 45,
   SC_PARADROP = 46,
-  SC_POPUP_COMB_INF = 47
+  SC_POPUP_COMB_INF = 47,
+  SC_RELOAD_THEME = 48,
+  SC_RELOAD_TILESET = 49
 };
 
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits