New upstream version 0.5.1+git20171103

5 files changed, 85 insertions, 18 deletions

diff --git a/shell/callbacks.c b/shell/callbacks.c
index 95a7bd61..9bb5c990 100644
--- a/shell/callbacks.c
+++ b/shell/callbacks.c
@@ -114,7 +114,7 @@ void cb_about_module(GtkAction * action)
 
 	    gtk_window_set_transient_for(GTK_WINDOW(about), GTK_WINDOW(shell->window));
 
-	    text = g_strdup_printf(_("%s Module"), sm->name);
+	    text = g_strdup(sm->name);
 #if GTK_CHECK_VERSION(2, 12, 0)
 	    gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about), text);
 #else
@@ -132,7 +132,7 @@ void cb_about_module(GtkAction * action)
 
 	    if (ma->description)
 		gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about),
-					      ma->description);
+					      _(ma->description));
 
 	    gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), sm->icon);
 	    gtk_dialog_run(GTK_DIALOG(about));
diff --git a/shell/menu.c b/shell/menu.c
index e966f485..b0f01e58 100644
--- a/shell/menu.c
+++ b/shell/menu.c
@@ -49,17 +49,17 @@ static GtkActionEntry entries[] = {
      NULL,
      G_CALLBACK(cb_sync_manager)},
 
-    {"OpenAction", GTK_STOCK_OPEN,
+    {"OpenAction", "_Open",
      N_("_Open..."), NULL,
      NULL,
      G_CALLBACK(cb_sync_manager)},
 
-    {"CopyAction", GTK_STOCK_COPY,
+    {"CopyAction", "_Copy",
      N_("_Copy to Clipboard"), "<control>C",
      N_("Copy to clipboard"),
      G_CALLBACK(cb_copy_to_clipboard)},
 
-    {"RefreshAction", GTK_STOCK_REFRESH,
+    {"RefreshAction", "_Refresh",
      N_("_Refresh"), "F5",
      NULL,
      G_CALLBACK(cb_refresh)},
@@ -74,12 +74,12 @@ static GtkActionEntry entries[] = {
      NULL,
      G_CALLBACK(cb_report_bug)},
 
-    {"AboutAction", GTK_STOCK_ABOUT,
+    {"AboutAction", "_About",
      N_("_About HardInfo"), NULL,
      N_("Displays program version information"),
      G_CALLBACK(cb_about)},
 
-    {"QuitAction", GTK_STOCK_QUIT,
+    {"QuitAction", "_Quit",
      N_("_Quit"), "<control>Q",
      NULL,
      G_CALLBACK(cb_quit)}
diff --git a/shell/report.c b/shell/report.c
index 398af323..135dfd9b 100644
--- a/shell/report.c
+++ b/shell/report.c
@@ -494,9 +494,9 @@ static gchar *report_get_filename(void)
     dialog = gtk_file_chooser_dialog_new(_("Save File"),
 					 NULL,
 					 GTK_FILE_CHOOSER_ACTION_SAVE,
-					 "_Cancel",
+					 _("_Cancel"),
 					 GTK_RESPONSE_CANCEL,
-					 "_Save",
+					 _("_Save"),
 					 GTK_RESPONSE_ACCEPT, NULL);
 #else
     dialog = gtk_file_chooser_dialog_new(_("Save File"),
@@ -648,8 +648,8 @@ static gboolean report_generate(ReportDialog * rd)
 					_("Open the report with your web browser?"));
 #if GTK_CHECK_VERSION(3, 0, 0)
     gtk_dialog_add_buttons(GTK_DIALOG(dialog),
-			       "_No", GTK_RESPONSE_REJECT,
-			       "_Open", GTK_RESPONSE_ACCEPT, NULL);
+			       _("_No"), GTK_RESPONSE_REJECT,
+			       _("_Open"), GTK_RESPONSE_ACCEPT, NULL);
 #else
 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
 			       GTK_STOCK_NO, GTK_RESPONSE_REJECT,
@@ -918,7 +918,7 @@ static ReportDialog
  * gtk_dialog_get_action_area has been deprecated since version 3.12 and should not be used in newly-written code.
  * Direct access to the action area is discouraged; use gtk_dialog_add_button(), etc.
  */
-    dialog1_action_area = gtk_dialog_get_action_area(GTK_DIALOG(dialog));
+    dialog1_action_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 #else
     dialog1_action_area = GTK_DIALOG(dialog)->action_area;
 #endif
diff --git a/shell/shell.c b/shell/shell.c
index b81e77b6..8688f9ac 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -447,7 +447,7 @@ static void create_window(void)
 
     shell->status = gtk_label_new("");
 #if GTK_CHECK_VERSION(3, 0, 0)
-    gtk_widget_set_valign(GTK_MISC(shell->status), GTK_ALIGN_CENTER);
+    gtk_widget_set_valign(GTK_WIDGET(shell->status), GTK_ALIGN_CENTER);
 #else
     gtk_misc_set_alignment(GTK_MISC(shell->status), 0.0, 0.5);
 #endif
@@ -512,7 +512,8 @@ static void menu_item_set_icon_always_visible(Shell *shell,
 
     path = g_strdup_printf("%s/%s", parent_path, item_id);
     menuitem = gtk_ui_manager_get_widget(shell->ui_manager, path);
-#if GTK_CHECK_VERSION(2, 18, 0)
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuitem), TRUE);
 #endif
     g_free(path);
@@ -690,7 +691,7 @@ ShellSummary *summary_new(void)
                                    GTK_POLICY_AUTOMATIC,
                                    GTK_POLICY_AUTOMATIC);
 #if GTK_CHECK_VERSION(3, 0, 0)
-    gtk_container_add(GTK_SCROLLED_WINDOW(summary->scroll),
+    gtk_container_add(GTK_CONTAINER(summary->scroll),
                                           summary->view);
 #else
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(summary->scroll),
@@ -701,6 +702,17 @@ ShellSummary *summary_new(void)
     return summary;
 }
 
+static gboolean
+select_first_tree_item(gpointer data)
+{
+    GtkTreeIter first;
+
+    if (gtk_tree_model_get_iter_first(shell->tree->model, &first))
+        gtk_tree_selection_select_iter(shell->tree->selection, &first);
+
+    return FALSE;
+}
+
 void shell_init(GSList * modules)
 {
     if (shell) {
@@ -770,6 +782,9 @@ void shell_init(GSList * modules)
 #else
     shell_action_set_enabled("SyncManagerAction", sync_manager_count_entries() > 0);
 #endif
+
+    /* Should select Computer Summary (note: not Computer/Summary) */
+    g_idle_add(select_first_tree_item, NULL);
 }
 
 static gboolean update_field(gpointer data)
@@ -978,7 +993,10 @@ static void set_view_type(ShellViewType viewtype, gboolean reload)
     }
 
     /* turn off the rules hint */
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(shell->info->view), FALSE);
+#endif
 
     close_note(NULL, NULL);
 
@@ -1148,10 +1166,13 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry,
 		    g_free(file);
 		}
 	    } else if (g_str_equal(key, "Zebra")) {
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
 		gtk_tree_view_set_rules_hint(GTK_TREE_VIEW
 					     (shell->info->view),
 					     g_key_file_get_boolean
 					     (key_file, group, key, NULL));
+#endif
 	    }
 	}
 
@@ -1389,6 +1410,30 @@ select_first_item(gpointer data)
     return FALSE;
 }
 
+static gboolean
+select_marked_or_first_item(gpointer data)
+{
+    GtkTreeIter first, it;
+    gboolean found_selection = FALSE;
+    gchar *datacol;
+
+    if ( gtk_tree_model_get_iter_first(shell->info->model, &first) ) {
+        it = first;
+        while ( gtk_tree_model_iter_next(shell->info->model, &it) ) {
+            gtk_tree_model_get(shell->info->model, &it, INFO_TREE_COL_DATA, &datacol, -1);
+            if (datacol != NULL && *datacol == '*') {
+                gtk_tree_selection_select_iter(shell->info->selection, &it);
+                found_selection = TRUE;
+            }
+            g_free(datacol);
+        }
+
+        if (!found_selection)
+            gtk_tree_selection_select_iter(shell->info->selection, &first);
+    }
+    return FALSE;
+}
+
 static void
 module_selected_show_info(ShellModuleEntry * entry, gboolean reload)
 {
@@ -1491,7 +1536,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload)
         case SHELL_VIEW_DUAL:
         case SHELL_VIEW_LOAD_GRAPH:
         case SHELL_VIEW_PROGRESS_DUAL:
-            g_idle_add(select_first_item, NULL);
+            g_idle_add(select_marked_or_first_item, NULL);
         }
     }
 }
@@ -1507,6 +1552,9 @@ static void info_selected_show_extra(gchar * data)
 	return;
 
     if (data) {
+        /* skip the select marker */
+        if (*data == '*')
+            data++;
 	GKeyFile *key_file = g_key_file_new();
 	gchar *key_data = shell->selected->morefunc(data);
 	gchar **groups;
@@ -1613,15 +1661,22 @@ static void shell_summary_add_item(ShellSummary *summary,
      gtk_box_pack_start(GTK_BOX(frame_label_box), frame_image, FALSE, FALSE, 0);
      gtk_box_pack_start(GTK_BOX(frame_label_box), frame_label, FALSE, FALSE, 0);
 
+     content = gtk_label_new(temp);
      /* TODO:GTK3 gtk_alignment_new(), etc is deprecated from 3.14 */
+#if GTK_CHECK_VERSION(3, 0, 0)
+     GtkWidget *frame_box;
+     frame_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+     gtk_widget_set_margin_start(GTK_WIDGET(frame_box), 48);
+     gtk_box_pack_start(GTK_BOX(frame_box), content, FALSE, FALSE, 0);
+     gtk_container_add(GTK_CONTAINER(frame), frame_box);
+#else
      alignment = gtk_alignment_new(0.5, 0.5, 1, 1);
      gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 48, 0);
      gtk_widget_show(alignment);
      gtk_container_add(GTK_CONTAINER(frame), alignment);
-
-     content = gtk_label_new(temp);
      gtk_misc_set_alignment(GTK_MISC(content), 0.0, 0.5);
      gtk_container_add(GTK_CONTAINER(alignment), content);
+#endif
 
      gtk_widget_show_all(frame);
      gtk_widget_show_all(frame_label_box);
diff --git a/shell/stock.c b/shell/stock.c
index ad1a0135..86d66778 100644
--- a/shell/stock.c
+++ b/shell/stock.c
@@ -38,6 +38,8 @@ static GtkIconFactory *icon_factory;
 
 void stock_icon_register(gchar * filename, gchar * stock_id)
 {
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     GtkIconSet *icon_set;
     GtkIconSource *icon_source;
 
@@ -52,10 +54,13 @@ void stock_icon_register(gchar * filename, gchar * stock_id)
     gtk_icon_factory_add(icon_factory, stock_id, icon_set);
 
     gtk_icon_set_unref(icon_set);
+#endif
 }
 
 void stock_icon_register_pixbuf(GdkPixbuf * pixbuf, gchar * stock_id)
 {
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     GtkIconSet *icon_set;
     GtkIconSource *icon_source;
 
@@ -69,6 +74,7 @@ void stock_icon_register_pixbuf(GdkPixbuf * pixbuf, gchar * stock_id)
     gtk_icon_factory_add(icon_factory, stock_id, icon_set);
 
     gtk_icon_set_unref(icon_set);
+#endif
 }
 
 void stock_icons_init(void)
@@ -78,14 +84,20 @@ void stock_icons_init(void)
 
     DEBUG("initializing stock icons");
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     icon_factory = gtk_icon_factory_new();
+#endif
 
     for (i = 0; i < n_stock_icons; i++) {
 	stock_icon_register(stock_icons[i].filename,
 			    stock_icons[i].stock_id);
     }
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#else
     gtk_icon_factory_add_default(icon_factory);
+#endif
 
     g_object_unref(icon_factory);
 }