Removed old misc vala file.

rilian-la-te · Oct 1, 2017 · 1b4aeb4 · 1b4aeb4
1 parent 0595bbf
commit 1b4aeb4
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 52 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -44,7 +44,6 @@ if(GLIB_OLD_FOUND)
         guuid.h)
 endif()
 set(VALA_FILES
-	misc-old.vala
 	configurator.vala
 	applet-holder.vala
 	panel-layout.vala

diff --git a/lib/configurator.vala b/lib/configurator.vala
@@ -61,7 +61,7 @@ namespace ValaPanel
         [GtkChild (name="configure-button")]
         Button configure_button;
         [GtkChild (name="prefs")]
-        internal Stack prefs_stack;
+        public Stack prefs_stack;
 
         const GLib.ActionEntry[] entries_monitor =
         {

diff --git a/lib/misc-old.vala b/lib/misc-old.vala
diff --git a/lib/misc.c b/lib/misc.c
@@ -21,8 +21,9 @@
 #include <string.h>
 
 #include "css.h"
-#include "lib/definitions.h"
+#include "definitions.h"
 #include "misc.h"
+#include "toplevel.h"
 
 static void set_widget_align(GtkWidget *user_data, gpointer data)
 {
@@ -77,6 +78,36 @@ void vala_panel_setup_button(GtkButton *b, GtkImage *img, const char *label)
 	gtk_button_set_relief(b, GTK_RELIEF_NONE);
 }
 
+void vala_panel_setup_icon(GtkImage *img, GIcon *icon, ValaPanelToplevel *top, int size)
+{
+	gtk_image_set_from_gicon(img, icon, GTK_ICON_SIZE_INVALID);
+	if (top != NULL)
+		g_object_bind_property(top,
+		                       VALA_PANEL_KEY_ICON_SIZE,
+		                       img,
+		                       "pixel-size",
+		                       G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+	else if (size > 0)
+		gtk_image_set_pixel_size(img, size);
+}
+
+void vala_panel_setup_icon_button(GtkButton *btn, GIcon *icon, const char *label,
+                                  ValaPanelToplevel *top)
+{
+	css_apply_from_resource(btn, "/org/vala-panel/lib/style.css", "-panel-icon-button");
+	css_toggle_class(btn, GTK_STYLE_CLASS_BUTTON, true);
+	GtkImage *img = NULL;
+	if (icon != NULL)
+	{
+		img = gtk_image_new();
+		vala_panel_setup_icon(img, icon, top, -1);
+	}
+	vala_panel_setup_button(btn, img, label);
+	gtk_container_set_border_width(btn, 0);
+	gtk_widget_set_can_focus(btn, false);
+	gtk_widget_set_has_window(btn, false);
+}
+
 inline void vala_panel_apply_window_icon(GtkWindow *win)
 {
 	g_autoptr(GdkPixbuf) icon =

diff --git a/lib/misc.h b/lib/misc.h
@@ -23,10 +23,15 @@
 #include <gtk/gtk.h>
 #include <stdbool.h>
 
+#include "toplevel.h"
+
 G_BEGIN_DECLS
 
 void vala_panel_setup_label(GtkLabel *label, const char *text, bool bold, double factor);
 void vala_panel_setup_button(GtkButton *b, GtkImage *img, const char *label);
+void vala_panel_setup_icon(GtkImage *img, GIcon *icon, ValaPanelToplevel *top, int size);
+void vala_panel_setup_icon_button(GtkButton *btn, GIcon *icon, const char *label,
+                                  ValaPanelToplevel *top);
 void vala_panel_scale_button_set_range(GtkScaleButton *b, gint lower, gint upper);
 void vala_panel_scale_button_set_value_labeled(GtkScaleButton *b, gint value);
 void vala_panel_add_prop_as_action(GActionMap *map, const char *prop);

diff --git a/lib/vala-panel.vapi b/lib/vala-panel.vapi
@@ -151,9 +151,9 @@ namespace ValaPanel {
 		[NoAccessorMethod]
 		public int width { get; internal set; }
 	}
-	[CCode (cheader_filename = "vala-panel-compat.h")]
+	[CCode (cheader_filename = "misc.h")]
 	public static void setup_icon (Gtk.Image img, GLib.Icon icon, ValaPanel.Toplevel? top = null, int size = -1);
-	[CCode (cheader_filename = "vala-panel-compat.h")]
+	[CCode (cheader_filename = "misc.h")]
 	public static void setup_icon_button (Gtk.Button btn, GLib.Icon? icon = null, string? label = null, ValaPanel.Toplevel? top = null);
     [CCode (cheader_filename="misc.h")]
     public static void apply_window_icon(Window w);

diff --git a/vapi/cvalapanel.vapi b/vapi/cvalapanel.vapi
@@ -177,6 +177,10 @@ namespace ValaPanel
     }
     [CCode(cname = "_user_config_file_name",cheader_filename="definitions.h")]
     internal string user_config_file_name(string name1, string profile, string? name2);
+	[CCode (cheader_filename = "misc.h")]
+	public static void setup_icon (Gtk.Image img, GLib.Icon icon, ValaPanel.Toplevel? top = null, int size = -1);
+	[CCode (cheader_filename = "misc.h")]
+	public static void setup_icon_button (Gtk.Button btn, GLib.Icon? icon = null, string? label = null, ValaPanel.Toplevel? top = null);
     [CCode (cheader_filename="misc.h")]
     public static void apply_window_icon(Window w);
     [CCode (cheader_filename="misc.h")]