QT: Fixed missing icons and broken timer.

xtt/lib/ge/qt/ge_qt.cqt

@@ -1544,7 +1544,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
   addMenuItem(toplevel, view, "Zoom &Out", SLOT(activate_zoom_out()), "CTRL+O",
       "zoom-out");
   addMenuItem(toplevel, view, "Zoom &Reset", SLOT(activate_zoom_reset()), "",
-      "zoom-reset");
+      "zoom-original");
   view_plant_w = addCheckableMenuItem(
       toplevel, view, "Vi&ew Plant", SLOT(activate_view_plant(bool)), "CTRL+P");
   view_graphlist_w = addCheckableMenuItem(
@@ -1675,7 +1675,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
 
   // Line type option menu
   QMenu* tools_linetype = addToolMenu(toplevel, tools3, "Line Type");
-  for (int i = 0; i < 7; i++) {
+  for (int i = 1; i <= 7; i++) {
     std::ostringstream txt;
     txt << "Linetype " << i;
     std::ostringstream fname;
@@ -1705,20 +1705,22 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
       toplevel, tools_textfont, "Helvetica", SLOT(activate_textfont()));
   tools_textfont_1->setFont(QFont(fl("Helvetica")));
   tools_textfont_1->setData(glow_eFont_Helvetica);
+
   QAction* tools_textfont_2 = addMenuItem(
       toplevel, tools_textfont, "Times", SLOT(activate_textfont()));
-
   tools_textfont_2->setFont(QFont(fl("Times")));
   tools_textfont_2->setData(glow_eFont_Times);
+
   QAction* tools_textfont_3 = addMenuItem(toplevel, tools_textfont,
       "New Century Schoolbook", SLOT(activate_textfont()));
   tools_textfont_3->setFont(QFont(fl("New Century Schoolbook")));
   tools_textfont_3->setData(glow_eFont_NewCenturySchoolbook);
+
   QAction* tools_textfont_4 = addMenuItem(
       toplevel, tools_textfont, "Courier", SLOT(activate_textfont()));
-
   tools_textfont_4->setFont(QFont(fl("Courier")));
   tools_textfont_4->setData(glow_eFont_Courier);
+
   QAction* tools_textfont_5 = addMenuItem(
       toplevel, tools_textfont, "Lucida Sans", SLOT(activate_textfont()));
   tools_textfont_5->setFont(QFont(fl("Lucida Sans")));

xtt/lib/ge/qt/ge_qt.h

@@ -62,7 +62,7 @@ public:
   QLabel* msg_label;
   QLabel* cmd_prompt;
   QAction* grid_on_w;
-  QAction** grid_sizes;
+  QAction* grid_sizes[4];
   QAction* show_grid_w;
   QAction* view_plant_w;
   QAction* view_graphlist_w;

xtt/lib/glow/qt/glow_scroll_widget_qt.cqt

@@ -114,7 +114,7 @@ void QtScrollWidgetGlow::scroll_callback_cb()
   glow_sScroll* data = &this->scroll_data;
   widget_sScroll* scroll_data = (widget_sScroll*)data->scroll_data;
 
-  scroll_timerid = 0;
+  scroll_timerid->stop();
 
   if (data->total_width <= data->window_width) {
     if (data->offset_x == 0) {
@@ -227,9 +227,6 @@ void QtScrollWidgetGlow::closeEvent(QCloseEvent* event)
   debug_print("QtScrollWidgetGlow::closeEvent\n");
   if (!destroyed) {
     destroyed = 1;
-    if (scroll_timerid) {
-      delete scroll_timerid;
-    }
     if (is_navigator && parent_ctx) {
       if (!((QtScrollWidgetGlow*)main_widget)->destroyed) {
         ((GlowCtx*)parent_ctx)->no_nav = 1;