Author: mir3x
Date: Tue Dec  8 22:20:29 2015
New Revision: 30889

URL: http://svn.gna.org/viewcvs/freeciv?rev=30889&view=rev
Log:
Shows tooltips about pointed units/improvement/technogies on 
research diagram in Qt-client.

See patch #6650


Modified:
    branches/S2_6/client/gui-qt/citydlg.cpp
    branches/S2_6/client/gui-qt/optiondlg.cpp
    branches/S2_6/client/gui-qt/optiondlg.h
    branches/S2_6/client/gui-qt/repodlgs.cpp
    branches/S2_6/client/gui-qt/repodlgs.h

Modified: branches/S2_6/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=30889&r1=30888&r2=30889&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/citydlg.cpp     (original)
+++ branches/S2_6/client/gui-qt/citydlg.cpp     Tue Dec  8 22:20:29 2015
@@ -59,6 +59,7 @@
                                        */
 static city_dialog *city_dlg;
 extern QString split_text(QString text);
+extern QString cut_helptext(QString text);
 
 /****************************************************************************
   Draws X on pixmap pointing its useless
@@ -2687,16 +2688,7 @@
   }
 
   /* Remove all lines from help which has '*' in first 3 chars */
-  sl = str.split('\n');
-  foreach (const QString & s, sl) {
-    if (s.count() > 2) {
-      if (s.at(0) != '*' && s.at(1) != '*' && s.at(2) != '*') {
-        ret_str = ret_str + s + '\n';
-      }
-    } else {
-      ret_str = ret_str + s + '\n';
-    }
-  }
+  ret_str = cut_helptext(str);
 
   ret_str = split_text(ret_str);
   ret_str = ret_str.trimmed();

Modified: branches/S2_6/client/gui-qt/optiondlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/optiondlg.cpp?rev=30889&r1=30888&r2=30889&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/optiondlg.cpp   (original)
+++ branches/S2_6/client/gui-qt/optiondlg.cpp   Tue Dec  8 22:20:29 2015
@@ -81,6 +81,29 @@
   result.remove(result.lastIndexOf('\n'), 1);
   return result;
 }
+
+/****************************************************************************
+  Remove some text from given text(help text) to show as tooltip
+****************************************************************************/
+QString cut_helptext(QString text)
+{
+  QStringList sl;
+  QString ret_str;
+
+  /* Remove all lines from help which has '*' in first 3 chars */
+  sl = text.split('\n');
+  foreach (const QString & s, sl) {
+    if (s.count() > 2) {
+      if (s.at(0) != '*' && s.at(1) != '*' && s.at(2) != '*') {
+        ret_str = ret_str + s + '\n';
+      }
+    } else {
+      ret_str = ret_str + s + '\n';
+    }
+  }
+  return ret_str;
+}
+
 
 /****************************************************************************
   Constructor for options dialog.

Modified: branches/S2_6/client/gui-qt/optiondlg.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/optiondlg.h?rev=30889&r1=30888&r2=30889&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/optiondlg.h     (original)
+++ branches/S2_6/client/gui-qt/optiondlg.h     Tue Dec  8 22:20:29 2015
@@ -32,6 +32,7 @@
 class QString;
 
 QString split_text(QString text);
+QString cut_helptext(QString text);
 /****************************************************************************
   Dialog for client/server options
 ****************************************************************************/

Modified: branches/S2_6/client/gui-qt/repodlgs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/repodlgs.cpp?rev=30889&r1=30888&r2=30889&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/repodlgs.cpp    (original)
+++ branches/S2_6/client/gui-qt/repodlgs.cpp    Tue Dec  8 22:20:29 2015
@@ -23,12 +23,14 @@
 #include <QProgressBar>
 #include <QScrollArea>
 #include <QTableWidget>
+#include <QToolTip>
 
 // common
 #include "control.h"
 #include "research.h"
 
 // client
+#include "helpdata.h"
 #include "repodlgs_common.h"
 #include "reqtree.h"
 #include "sprite.h"
@@ -40,6 +42,36 @@
 
 #include "repodlgs.h"
 
+extern QString split_text(QString text);
+extern QString cut_helptext(QString text);
+
+/****************************************************************************
+  From reqtree.c used to get tooltips
+****************************************************************************/
+struct tree_node {
+  bool is_dummy;
+  Tech_type_id tech;
+  int nrequire;
+  struct tree_node **require;
+  int nprovide;
+  struct tree_node **provide;
+  int order, layer;
+  int node_x, node_y, node_width, node_height;
+  int number;
+};
+
+/****************************************************************************
+  From reqtree.c used to get tooltips
+****************************************************************************/
+struct reqtree {
+  int num_nodes;
+  struct tree_node **nodes;
+  int num_layers;
+  int *layer_size;
+  struct tree_node ***layers;
+  int diagram_width, diagram_height;
+};
+
 /****************************************************************************
   Compare unit_items (used for techs) by name
 ****************************************************************************/
@@ -56,6 +88,7 @@
   pcanvas = NULL;
   req = NULL;
   reset();
+  setMouseTracking(true);
 }
 
 /****************************************************************************
@@ -65,6 +98,117 @@
 {
   qtg_canvas_free(pcanvas);
   destroy_reqtree(req);
+}
+
+/****************************************************************************
+  Constructor for req_tooltip_help
+****************************************************************************/
+req_tooltip_help::req_tooltip_help()
+{
+  tech_id = -1;
+  tunit = nullptr;
+  timpr = nullptr;
+}
+
+
+/****************************************************************************
+  Create list of rectangles for showing tooltips
+****************************************************************************/
+void research_diagram::create_tooltip_help()
+{
+  int i, j;
+  int swidth, sheight;
+  struct sprite *sprite;
+  reqtree *tree;
+  req_tooltip_help *rttp;
+
+  qDeleteAll(tt_help);
+  tt_help.clear();
+  if (req == nullptr) {
+    return;
+  } else {
+    tree = req;
+  }
+
+  for (i = 0; i < tree->num_layers; i++) {
+    for (j = 0; j < tree->layer_size[i]; j++) {
+      struct tree_node *node = tree->layers[i][j];
+      int startx, starty, width, height;
+
+      startx = node->node_x;
+      starty = node->node_y;
+      width = node->node_width;
+      height = node->node_height;
+
+      if (!node->is_dummy) {
+        const char *text = research_advance_name_translation(
+                                  research_get(client_player()), node->tech);
+        int text_w, text_h;
+        int icon_startx;
+
+        get_text_size(&text_w, &text_h, FONT_REQTREE_TEXT, text);
+        rttp = new req_tooltip_help();
+        rttp->rect = QRect(startx + (width - text_w) / 2, starty + 4,
+                           text_w, text_h);
+        rttp->tech_id = node->tech;
+        tt_help.append(rttp);
+        icon_startx = startx + 5;
+
+        if (gui_options.reqtree_show_icons) {
+          unit_type_iterate(unit) {
+            if (advance_number(unit->require_advance) != node->tech) {
+              continue;
+            }
+            sprite = get_unittype_sprite(tileset, unit, DIR8_SOUTH, TRUE);
+            get_sprite_dimensions(sprite, &swidth, &sheight);
+            rttp = new req_tooltip_help();
+            rttp->rect = QRect(icon_startx, starty + text_h + 4
+                               + (height - text_h - 4 - sheight) / 2,
+                               swidth, sheight);
+            rttp->tunit = unit;
+            tt_help.append(rttp);
+            icon_startx += swidth + 2;
+          } unit_type_iterate_end;
+
+          improvement_iterate(pimprove) {
+            requirement_vector_iterate(&(pimprove->reqs), preq) {
+              if (VUT_ADVANCE == preq->source.kind
+                  && advance_number(preq->source.value.advance) == node->tech) 
{
+                sprite = get_building_sprite(tileset, pimprove);
+                if (sprite) {
+                  get_sprite_dimensions(sprite, &swidth, &sheight);
+                  rttp = new req_tooltip_help();
+                  rttp->rect = QRect(icon_startx, starty + text_h + 4
+                                     + (height - text_h - 4 - sheight) / 2,
+                                     swidth, sheight);
+                  rttp->timpr = pimprove;
+                  tt_help.append(rttp);
+                  icon_startx += swidth + 2;
+                }
+              }
+            } requirement_vector_iterate_end;
+          } improvement_iterate_end;
+
+          governments_iterate(gov) {
+            requirement_vector_iterate(&(gov->reqs), preq) {
+              if (VUT_ADVANCE == preq->source.kind
+                  && advance_number(preq->source.value.advance) == node->tech) 
{
+                sprite = get_government_sprite(tileset, gov);
+                get_sprite_dimensions(sprite, &swidth, &sheight);
+                rttp = new req_tooltip_help();
+                rttp->rect = QRect(icon_startx, starty + text_h + 4
+                                   + (height - text_h - 4 - sheight) / 2,
+                                   swidth, sheight);
+                rttp->tech_id = node->tech;
+                tt_help.append(rttp);
+                icon_startx += swidth + 2;
+              }
+            } requirement_vector_iterate_end;
+          } governments_iterate_end;
+        }
+      }
+    }
+  }
 }
 
 /****************************************************************************
@@ -75,6 +219,7 @@
   destroy_reqtree(req);
   req = create_reqtree(client_player(), true);
   draw_reqtree(req, pcanvas, 0, 0, 0, 0, width, height);
+  create_tooltip_help();
   update();
 }
 
@@ -113,6 +258,45 @@
       break;
     case TECH_KNOWN:
       break;
+    }
+  }
+}
+
+/****************************************************************************
+  Mouse move handler for research_diagram - for showing tooltips
+****************************************************************************/
+void research_diagram::mouseMoveEvent(QMouseEvent *event)
+{
+  req_tooltip_help *rttp;
+  int i;
+  QString tt_text;
+  char buffer[8192];
+  char buf2[1];
+
+  buf2[0] = '\0';
+  for (i = 0; i < tt_help.count(); i++) {
+    rttp = tt_help.at(i);
+    if (rttp->rect.contains(event->pos())) {
+      if (rttp->tech_id != -1) {
+        helptext_advance(buffer, sizeof(buffer), client.conn.playing,
+                         buf2, rttp->tech_id);
+        tt_text = QString(buffer);
+      } else if (rttp->timpr != nullptr) {
+        tt_text = helptext_building(buffer, sizeof(buffer),
+                                    client.conn.playing, NULL, rttp->timpr);
+        tt_text = cut_helptext(tt_text);
+      } else if (rttp->tunit != nullptr) {
+        tt_text = helptext_unit(buffer, sizeof(buffer), client.conn.playing,
+                                buf2, rttp->tunit);
+        tt_text = cut_helptext(tt_text);
+      } else {
+        return;
+      }
+      tt_text = split_text(tt_text);
+      tt_text = tt_text.trimmed();
+      if (QToolTip::text() == "") {
+        QToolTip::showText(event->globalPos(), tt_text, this, rttp->rect);
+      }
     }
   }
 }

Modified: branches/S2_6/client/gui-qt/repodlgs.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/repodlgs.h?rev=30889&r1=30888&r2=30889&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/repodlgs.h      (original)
+++ branches/S2_6/client/gui-qt/repodlgs.h      Tue Dec  8 22:20:29 2015
@@ -50,6 +50,19 @@
 };
 
 /****************************************************************************
+  Helper item for research diagram, about drawn rectangles and what
+  tech/unit/improvement they point to.
+****************************************************************************/
+class req_tooltip_help
+{
+public:
+  req_tooltip_help();
+  QRect rect;
+  Tech_type_id tech_id;
+  struct unit_type *tunit;
+  struct impr_type *timpr;
+};
+/****************************************************************************
   Custom widget representing research diagram in science_report
 ****************************************************************************/
 class research_diagram: public QWidget
@@ -65,11 +78,14 @@
 
 private:
   void mousePressEvent(QMouseEvent *event);
+  void mouseMoveEvent(QMouseEvent *event);
   void paintEvent(QPaintEvent *event);
+  void create_tooltip_help();
   struct canvas *pcanvas;
   struct reqtree *req;
   int width;
   int height;
+  QList<req_tooltip_help*> tt_help;
 };
 
 /****************************************************************************


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

Reply via email to