]> gitweb.michael.orlitzky.com - xfce4-hdaps.git/blobdiff - panel-plugin/xfce4-hdaps-dialogs.c
xfce4-hdaps-dialogs.c: replace obsolete gtk_misc_set_alignment().
[xfce4-hdaps.git] / panel-plugin / xfce4-hdaps-dialogs.c
index 80e0bcc3ba580f22f0ce5ce5e22c229e804fa9e0..dc104fdff75f67329b4d84747e93d99fc4e8fe73 100644 (file)
@@ -1,11 +1,34 @@
+/*
+ * xfce4-hdaps, an XFCE4 panel plugin for the HDAPS system.
+ *
+ * Copyright (C) 2019 Michael Orlitzky
+ *
+ *   http://michael.orlitzky.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details:
+ *
+ *   https://www.gnu.org/licenses/agpl-3.0.html
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include "xfce4-hdaps-dialogs.h"
+#include "hdaps.h"
 
 /* Wild guess. Actually borrowed from some code
    I copy-and-pasted. Doesn't seem too ugly. */
@@ -14,7 +37,7 @@
 /* If people can't read the README, well maybe
  *  they can do it /online/.
  */
-#define PLUGIN_WEBSITE "http://michael.orlitzky.com/code/xfce4-hdaps.php"
+#define PLUGIN_WEBSITE "http://michael.orlitzky.com/code/xfce4-hdaps.xhtml"
 
 
 static void hdaps_configure_response(GtkWidget   *dialog,
@@ -39,7 +62,7 @@ static void hdaps_configure_response(GtkWidget   *dialog,
        want to save any settings that may have changed. */
     g_object_set_data(G_OBJECT(hdaps->plugin), "dialog", NULL);
     hdaps->poll_frequency = gtk_spin_button_get_value_as_int((GtkSpinButton*)hdaps->sb_poll_frequency);
-    hdaps->device_name = gtk_combo_box_get_active_text((GtkComboBox*)hdaps->cb_device_name);
+    hdaps->device_name = gtk_combo_box_text_get_active_text((GtkComboBoxText*)hdaps->cb_device_name);
     snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
     hdaps_save(hdaps->plugin, hdaps);
     hdaps_reset_timeout(hdaps);
@@ -78,7 +101,7 @@ void hdaps_configure(XfcePanelPlugin *plugin,
   /* Create the dialog */
   dialog = xfce_titled_dialog_new_with_buttons(_("Hdaps Plugin"),
                                               GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                                              GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                              GTK_DIALOG_DESTROY_WITH_PARENT,
                                               GTK_STOCK_HELP, GTK_RESPONSE_HELP,
                                               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -111,7 +134,8 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Poll Frequency:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
   hdaps->sb_poll_frequency = gtk_spin_button_new_with_range(100, 5000, 100);
@@ -129,27 +153,34 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Device Name:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-  hdaps->cb_device_name = gtk_combo_box_new_text();
+  hdaps->cb_device_name = gtk_combo_box_text_new();
+
   /* Add the current device name, it should always be available.
      Oh, and it should be the default, too. */
-  gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps->device_name);
+  gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps->device_name);
   
   /* This function takes an index, and 0 should be the first
      (only) index at this point. */
   gtk_combo_box_set_active((GtkComboBox*)hdaps->cb_device_name, 0);
   
   /* Now loop through the list of available devices, adding each
-     to the list as we go. I believe GTK takes care of the duplicates
-     for us. */
+     to the list as we go. */
   char hdaps_devices[MAX_HDAPS_DEVICES][FILENAME_MAX];
   int found_devices = get_hdaps_device_list(hdaps_devices);
   int list_idx = 0;
   
   for (list_idx = 0; list_idx < found_devices; list_idx++) {
-    gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps_devices[list_idx]);
+    /* We don't want to add duplicate entries to the combo box.
+       However, at this point, the current device name should be
+       the only entry. Therefore, to avoid duplicates, we only
+       have to avoid adding the current device name a second time. */
+    if (strcmp(hdaps_devices[list_idx], hdaps->device_name) != 0) {
+      gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]);
+    }
   }
   
   gtk_box_pack_start(GTK_BOX(hbox), hdaps->cb_device_name, FALSE, FALSE, 0);
@@ -160,35 +191,53 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
 
 
+
+/* URL handler used on the About dialog. */
+static void hdaps_url_handler(GtkAboutDialog *about,
+                             const gchar *link,
+                             gpointer data) {
+    gchar *cmd;
+
+    cmd = g_strdup_printf("%s %s","xdg-open", link);
+
+    /* Stolen from xfce4-power-manager. */
+    if (!g_spawn_command_line_async(cmd, NULL)) {
+      g_free(cmd);
+      cmd = g_strdup_printf("%s %s","xfbrowser4", link);
+      g_spawn_command_line_async(cmd, NULL);
+    }
+    g_free(cmd);
+}
+
+
+/* Email address handler used on the About dialog. */
+static void hdaps_mailto_handler(GtkAboutDialog *about,
+                                const gchar *link,
+                                gpointer data) {
+    gchar *cmd = g_strdup_printf( "%s %s", "xdg-email", link);
+
+    g_spawn_command_line_async(cmd, NULL);
+    g_free(cmd);
+}
+
+
 void hdaps_about(XfcePanelPlugin *plugin) {
-  GdkPixbuf *icon;
-  GtkWidget *dialog;
-  XfceAboutInfo *about;
-
-  /* Send NULL as our license, since GPL >= 3 is not
-     supported yet. I don't particularly care if people
-     want to re-license under GPL2, but I also don't want
-     to cause any unnecessary confusion. */
-  about = xfce_about_info_new("xfce4-hdaps",
-                             VERSION,
-                             _("An HDAPS Plugin for XFCE4"),
-                             XFCE_COPYRIGHT_TEXT("2009", "Michael Orlitzky"),
-                             NULL);
-  
-  xfce_about_info_set_homepage(about, PLUGIN_WEBSITE);
-  
-  xfce_about_info_add_credit(about,
-                            "Michael Orlitzky",
-                            "michael@orlitzky.com",
-                            _("A Reasonable Man"));
-
-  icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-                                 "xfce4-hdaps",
-                                 48, 0, NULL);
-  
-  dialog = xfce_about_dialog_new_with_values(NULL, about, icon);
-  xfce_about_info_free(about);
-  gtk_dialog_run(GTK_DIALOG(dialog));
-  gtk_widget_destroy(dialog);
-  g_object_unref(G_OBJECT(icon));
+  const gchar *authors[] = { "Michael Orlitzky <michael@orlitzky.com>", NULL };
+  const gchar *copyright = "Copyright \302\251 2012 Michael Orlitzky";
+
+  gtk_about_dialog_set_url_hook(hdaps_url_handler, NULL, NULL);
+  gtk_about_dialog_set_email_hook(hdaps_mailto_handler, NULL, NULL);
+
+  gtk_show_about_dialog(NULL,
+                       "authors", authors,
+                       "copyright", copyright,
+                       "destroy-with-parent", TRUE,
+                       "license", LICENSE_AGPL3,
+                       "logo-icon-name", PACKAGE_NAME,
+                       "icon-name", PACKAGE_NAME,
+                       "program-name", PACKAGE_NAME,
+                       "version", PACKAGE_VERSION,
+                       "website", PLUGIN_WEBSITE,
+                       "website-label", "xfce4-hdaps homepage",
+                       NULL);
 }