diff --git a/src/base.c b/src/base.c index 2c152c2..4e825d9 100644 --- a/src/base.c +++ b/src/base.c @@ -31,76 +31,184 @@ */ #include -#include -#include -/* - Static Variables - */ -static GtkWidget *p_input; -static GtkWidget *p_input_confirm; -static GtkWidget *register_button; - -/* - Functions - */ - -/* Compare password entries for admin registration confirmation */ static void -update_register_button(GObject *object, - GParamSpec *pspec, - gpointer data) +quit_activate (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { - const char *text = gtk_editable_get_text(GTK_EDITABLE(p_input)); - const char *text2 = gtk_editable_get_text(GTK_EDITABLE(p_input_confirm)); + GtkWidget *window = user_data; - //PLACEHOLDER Thish widget set needs to work with GtkBuilder. - //This can be done easily but may need a condiontal statement. - //Another issue is to use the gtkbuilder, I would have to duplicate code here or learn how to arrange each iteration in a module or easy to use function. - //gtk_widget_set_sensitive (register_button, - //text[0] != '\0' && g_str_equal (text, text2)); + gtk_window_destroy (GTK_WINDOW (window)); } - -/* Launch the application from activate */ + static void -activate(GtkApplication *app, - gpointer user_data) +about_activate (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { - /* Construct a GtkBuilder instance */ - GtkBuilder *builder = gtk_builder_new(); + GtkWidget *window = user_data; + GtkWidget *about_dlg; + + about_dlg = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "about")); + gtk_window_present (GTK_WINDOW (about_dlg)); +} + +static void +remove_timeout (gpointer data) +{ + guint id = GPOINTER_TO_UINT (data); + + g_source_remove (id); +} + +static int +pop_message (gpointer data) +{ + GtkWidget *status = data; + + gtk_label_set_label (GTK_LABEL (status), ""); + g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0)); + + return G_SOURCE_REMOVE; +} + +static void +status_message (GtkWidget *status, + const char *text) +{ + guint id; + + id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout")); + if (id) + g_source_remove (id); + + gtk_label_set_text (GTK_LABEL (status), text); + + id = g_timeout_add (5000, pop_message, status); + + g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout); +} + +static void +help_activate (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + GtkWidget *status; + + status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status")); + status_message (status, "Help not available"); +} + +static void +not_implemented (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + GtkWidget *status; + char *text; + + text = g_strdup_printf ("Action ā€œ%sā€ not implemented", g_action_get_name (G_ACTION (action))); + status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status")); + status_message (status, text); + g_free (text); +} + +static GActionEntry win_entries[] = { + { "new", not_implemented, NULL, NULL, NULL }, + { "open", not_implemented, NULL, NULL, NULL }, + { "save", not_implemented, NULL, NULL, NULL }, + { "save-as", not_implemented, NULL, NULL, NULL }, + { "copy", not_implemented, NULL, NULL, NULL }, + { "cut", not_implemented, NULL, NULL, NULL }, + { "paste", not_implemented, NULL, NULL, NULL }, + { "quit", quit_activate, NULL, NULL, NULL }, + { "about", about_activate, NULL, NULL, NULL }, + { "help", help_activate, NULL, NULL, NULL } +}; + +static void +activate(GtkApplication *app) +{ + + + static GtkWidget *window = NULL; + GActionGroup *actions; - /* Loads the UI objects */ - gtk_builder_add_from_file(builder, "src/ui/admin-register.ui", NULL); + if (!window) + { + GtkWidget *about; + GtkWidget *status; + GtkEventController *controller; - /* Register the ID's of gtk_object from admin-register.ui */ - GObject *window = gtk_builder_get_object(builder, "register_window"); + /* Construct a GtkBuilder instance */ + GtkBuilder *builder = gtk_builder_new(); + + /* Loads the UI objects */ + gtk_builder_add_from_file(builder, "src/ui/admin-register.ui", NULL); - p_input = gtk_builder_get_object(builder, "p_input"); - GObject *p_input_confirm = gtk_builder_get_object(builder, "p_input_confirm"); - GObject *register_button = gtk_builder_get_object(builder, "register_button"); - - /* Connect the actions of XML UI objects's with Gtk Signals */ - /* In Gtk_builder, we edit the specific widget; Gtk_builder contains all widgets created from Cambalache UI's */ + window = GTK_WIDGET (gtk_builder_get_object (builder, "window1")); + gtk_window_set_application (GTK_WINDOW (window),app); + g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window); + actions = (GActionGroup*)g_simple_action_group_new (); + g_action_map_add_action_entries (G_ACTION_MAP (actions), + win_entries, G_N_ELEMENTS (win_entries), + window); + gtk_widget_insert_action_group (window, "win", actions); - /* Connect input text with update_button compariative function */ - g_signal_connect(p_input, "notify::text", G_CALLBACK(update_register_button), NULL); - g_signal_connect(p_input_confirm, "notify::text", G_CALLBACK(update_register_button), NULL); - - /* Sets the app window with *app GtkApplication */ - gtk_window_set_application(GTK_WINDOW(window), app); + controller = gtk_shortcut_controller_new (); + gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller), + GTK_SHORTCUT_SCOPE_GLOBAL); + gtk_widget_add_controller (window, controller); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_n, GDK_CONTROL_MASK), + gtk_named_action_new ("win.new"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_o, GDK_CONTROL_MASK), + gtk_named_action_new ("win.open"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_s, GDK_CONTROL_MASK), + gtk_named_action_new ("win.save"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_s, GDK_CONTROL_MASK|GDK_SHIFT_MASK), + gtk_named_action_new ("win.save-as"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_q, GDK_CONTROL_MASK), + gtk_named_action_new ("win.quit"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_c, GDK_CONTROL_MASK), + gtk_named_action_new ("win.copy"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_x, GDK_CONTROL_MASK), + gtk_named_action_new ("win.cut"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_v, GDK_CONTROL_MASK), + gtk_named_action_new ("win.paste"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_F1, 0), + gtk_named_action_new ("win.help"))); + gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), + gtk_shortcut_new (gtk_keyval_trigger_new (GDK_KEY_F7, 0), + gtk_named_action_new ("win.about"))); - /* Display the Gtk GUI */ - gtk_widget_set_visible(window, TRUE); - - /* - * Adds a weak reference from weak_pointer object to indicate that the - * pointer located at weak_pointer_location is only valid during the lifetime of object. - * When the object is finalized, weak_pointer will be set to NULL. - */ - g_object_add_weak_pointer(G_OBJECT (window), (gpointer *)&window); + about = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1")); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); + gtk_window_set_hide_on_close (GTK_WINDOW (about), TRUE); + g_object_set_data_full (G_OBJECT (window), "about", + about, (GDestroyNotify)gtk_window_destroy); + + status = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar1")); + g_object_set_data (G_OBJECT (window), "status", status); + + g_object_unref (builder); + } + + if (!gtk_widget_get_visible (window)) + gtk_widget_set_visible (window, TRUE); + else + gtk_window_destroy (GTK_WINDOW (window)); - /* Dereference and free the computer memory */ - g_object_unref(builder); } /* diff --git a/src/drogondashboardapplication.c b/src/drogondashboardapplication.c deleted file mode 100644 index aa254cb..0000000 --- a/src/drogondashboardapplication.c +++ /dev/null @@ -1,63 +0,0 @@ -#include - -#include "drogondashboardapplication.h" -#include "drogondashboardwindow.h" - -struct _DrogonDashboardApp -{ - GtkApplication parent; -}; - -G_DEFINE_TYPE(DrogonDashboardApp, drogondashboard_app, GTK_TYPE_APPLICATION); - -static void -drogondashboard_app_init (DrogonDashboardApp *app) -{ -} - -static void -drogondashboard_app_activate (GApplication *app) -{ - DrogonDashboardAppWindow *win; - - win = drogondashboard_app_window_new (DROGONDASHBOARD_APP (app)); - gtk_window_present (GTK_WINDOW (win)); -} - -static void -drogondashboard_app_open (GApplication *app, - GFile **files, - int n_files, - const char *hint) -{ - GList *windows; - DrogonDashboardAppWindow *win; - int i; - - windows = gtk_application_get_windows (GTK_APPLICATION (app)); - if (windows) - win = DROGONDASHBOARD_APP_WINDOW (windows->data); - else - win = drogondashboard_app_window_new (DROGONDASHBOARD_APP (app)); - - for (i = 0; i < n_files; i++) - drogondashboard_app_window_open (win, files[i]); - - gtk_window_present (GTK_WINDOW (win)); -} - -static void -drogondashboard_app_class_init (DrogonDashboardAppClass *class) -{ - G_APPLICATION_CLASS (class)->activate = drogondashboard_app_activate; - G_APPLICATION_CLASS (class)->open = drogondashboard_app_open; -} - -DrogonDashboardApp * -drogondashboard_app_new (void) -{ - return g_object_new (DROGONDASHBOARD_APP_TYPE, - "application-id", "org.gtk.exampleapp", - "flags", G_APPLICATION_HANDLES_OPEN, - NULL); -} diff --git a/src/drogondashboardapplication.h b/src/drogondashboardapplication.h deleted file mode 100644 index 1a895c2..0000000 --- a/src/drogondashboardapplication.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __DROGONDASHBOARDAPP_H -#define __DROGONDASHBOARDAPP_H - -#include - - -#define DROGONDASHBOARD_APP_TYPE (drogondashboard_app_get_type ()) -G_DECLARE_FINAL_TYPE (DrogonDashboardApp, drogondashboard_app, DROGONDASHBOARD, APP, GtkApplication) - -DrogonDashboardApp *drogondashboard_app_new (void); - - -#endif /* __DROGONDASHBOARDAPP_H */ diff --git a/src/drogondashboardwindow.c b/src/drogondashboardwindow.c deleted file mode 100644 index 08de595..0000000 --- a/src/drogondashboardwindow.c +++ /dev/null @@ -1,46 +0,0 @@ -#include - -#include "drogondashboardapplication.h" -#include "drogondashboardwindow.h" - -struct _DrogonDashboardAppWindow -{ - GtkApplicationWindow parent; - - //GtkWidget *stack; - - -}; - -G_DEFINE_TYPE(DrogonDashboardAppWindow, drogondashboard_app_window, GTK_TYPE_APPLICATION_WINDOW); - -static void -drogondashboard_app_window_init (DrogonDashboardAppWindow *win) -{ - GtkBuilder *builder; - GtkWidget *window; - - gtk_widget_init_template (GTK_WIDGET (win)); - builder = gtk_builder_new_from_file("../src/ui/admin-register.ui"); - //menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu")); - window = GTK_WIDGET(gtk_builder_get_object(builder, "registerWindow")); - //gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (win->gears), menu); - g_object_unref (builder); -} - -static void -drogondashboard_app_window_class_init (DrogonDashboardAppWindowClass *class) -{ -} - -DrogonDashboardAppWindow * -drogondashboard_app_window_new (DrogonDashboardApp *app) -{ - return g_object_new (DROGONDASHBOARD_APP_WINDOW_TYPE, "application", app, NULL); -} - -void -drogondashboard_app_window_open (DrogonDashboardAppWindow *win, - GFile *file) -{ -} diff --git a/src/drogondashboardwindow.h b/src/drogondashboardwindow.h deleted file mode 100644 index 4026596..0000000 --- a/src/drogondashboardwindow.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __DROGONDASHBOARDAPPWIN_H -#define __DROGONDASHBOARDAPPWIN_H - -#include -#include "drogondashboardapplication.h" - - -#define DROGONDASHBOARD_APP_WINDOW_TYPE (drogondashboard_app_window_get_type ()) -G_DECLARE_FINAL_TYPE (DrogonDashboardAppWindow, drogondashboard_app_window, DROGONDASHBOARD, APP_WINDOW, GtkApplicationWindow) - - -DrogonDashboardAppWindow *drogondashboard_app_window_new (DrogonDashboardApp *app); -void drogondashboard_app_window_open (DrogonDashboardAppWindow *win, - GFile *file); - - -#endif /* __DROGONDASHBOARDAPPWIN_H */ diff --git a/src/ui/DrogonCMS.cmb b/src/ui/DrogonCMS.cmb new file mode 100644 index 0000000..ed64ad3 --- /dev/null +++ b/src/ui/DrogonCMS.cmb @@ -0,0 +1,155 @@ + + + + + (2,None,"admin-register.ui","admin-register.ui",None,None,None,None,None,None,None) + + + (2,1,"GtkListStore","liststore1",None,None,None,None,0,None,None), + (2,2,"(menu)","menubar",None,None,None,None,1,None,None), + (2,3,"(submenu)",None,2,None,None,None,0,None,None), + (2,4,"(section)",None,3,None,None,None,0,None,None), + (2,5,"(item)",None,4,None,None,None,0,None,None), + (2,6,"(item)",None,4,None,None,None,1,None,None), + (2,7,"(item)",None,4,None,None,None,2,None,None), + (2,8,"(item)",None,4,None,None,None,3,None,None), + (2,9,"(section)",None,3,None,None,None,1,None,None), + (2,10,"(item)",None,9,None,None,None,0,None,None), + (2,11,"(submenu)",None,2,None,None,None,1,None,None), + (2,12,"(section)",None,11,None,None,None,0,None,None), + (2,13,"(item)",None,12,None,None,None,0,None,None), + (2,14,"(item)",None,12,None,None,None,1,None,None), + (2,15,"(item)",None,12,None,None,None,2,None,None), + (2,16,"(submenu)",None,2,None,None,None,2,None,None), + (2,17,"(section)",None,16,None,None,None,0,None,None), + (2,18,"(item)",None,17,None,None,None,0,None,None), + (2,19,"(item)",None,17,None,None,None,1,None,None), + (2,20,"GtkAboutDialog","aboutdialog1",None,None,None,None,2,None,None), + (2,21,"GtkWindow","window1",None,None,None,None,3,None,None), + (2,22,"GtkBox","vbox1",21,None,None,None,0,None,None), + (2,23,"GtkPopoverMenuBar","menubar1",22,None,None,None,0,None,None), + (2,24,"GtkBox","toolbar1",22,None,None,None,1,None,None), + (2,25,"GtkButton",None,24,None,None,None,0,None,None), + (2,26,"GtkButton",None,24,None,None,None,1,None,None), + (2,27,"GtkButton",None,24,None,None,None,2,None,None), + (2,28,"GtkSeparator",None,24,None,None,None,3,None,None), + (2,29,"GtkButton",None,24,None,None,None,4,None,None), + (2,30,"GtkButton",None,24,None,None,None,5,None,None), + (2,31,"GtkButton",None,24,None,None,None,6,None,None), + (2,32,"GtkScrolledWindow","scrolledwindow1",22,None,None,None,2,None,None), + (2,33,"GtkTreeView","treeview1",32,None,None,None,0,None,None), + (2,34,"GtkTreeViewColumn","column1",33,None,None,None,0,None,None), + (2,35,"GtkCellRendererText","renderer1",34,None,None,None,0,None,"<attributes><attribute name=\"text\">0</attribute></attributes>"), + (2,36,"GtkTreeViewColumn","column2",33,None,None,None,1,None,None), + (2,37,"GtkCellRendererText","renderer2",36,None,None,None,0,None,"<attributes><attribute name=\"text\">1</attribute></attributes>"), + (2,38,"GtkTreeViewColumn","column3",33,None,None,None,2,None,None), + (2,39,"GtkCellRendererText","renderer3",38,None,None,None,0,None,"<attributes><attribute name=\"text\">2</attribute></attributes>"), + (2,40,"GtkLabel","statusbar1",22,None,None,None,3,None,None) + + + (2,3,"(submenu)","label","_File",1,None,None,None,None,None,None,None,None), + (2,5,"(item)","action","win.new",0,None,None,None,None,None,None,None,None), + (2,5,"(item)","label","_New",1,None,None,None,None,None,None,None,None), + (2,6,"(item)","action","win.open",0,None,None,None,None,None,None,None,None), + (2,6,"(item)","label","_Open",1,None,None,None,None,None,None,None,None), + (2,7,"(item)","action","win.save",0,None,None,None,None,None,None,None,None), + (2,7,"(item)","label","_Save",1,None,None,None,None,None,None,None,None), + (2,8,"(item)","action","win.save-as",0,None,None,None,None,None,None,None,None), + (2,8,"(item)","label","Save _As",1,None,None,None,None,None,None,None,None), + (2,10,"(item)","action","win.quit",0,None,None,None,None,None,None,None,None), + (2,10,"(item)","label","_Quit",1,None,None,None,None,None,None,None,None), + (2,11,"(submenu)","label","_Edit",1,None,None,None,None,None,None,None,None), + (2,13,"(item)","action","win.copy",0,None,None,None,None,None,None,None,None), + (2,13,"(item)","label","_Copy",1,None,None,None,None,None,None,None,None), + (2,14,"(item)","action","win.cut",0,None,None,None,None,None,None,None,None), + (2,14,"(item)","label","_Cut",1,None,None,None,None,None,None,None,None), + (2,15,"(item)","action","win.paste",0,None,None,None,None,None,None,None,None), + (2,15,"(item)","label","_Paste",1,None,None,None,None,None,None,None,None), + (2,16,"(submenu)","label","_Help",1,None,None,None,None,None,None,None,None), + (2,18,"(item)","action","win.help",0,None,None,None,None,None,None,None,None), + (2,18,"(item)","label","_Help",1,None,None,None,None,None,None,None,None), + (2,19,"(item)","action","win.about",0,None,None,None,None,None,None,None,None), + (2,19,"(item)","label","_About",1,None,None,None,None,None,None,None,None), + (2,20,"GtkAboutDialog","logo-icon-name","org.gtk.Demo4",1,None,None,None,None,None,None,None,None), + (2,20,"GtkAboutDialog","program-name","Builder demo",1,None,None,None,None,None,None,None,None), + (2,20,"GtkWindow","modal","True",0,None,None,None,None,None,None,None,None), + (2,21,"GtkWindow","default-height","250",0,None,None,None,None,None,None,None,None), + (2,21,"GtkWindow","default-width","440",0,None,None,None,None,None,None,None,None), + (2,21,"GtkWindow","title","Builder",1,None,None,None,None,None,None,None,None), + (2,22,"GtkOrientable","orientation","vertical",0,None,None,None,None,None,None,None,None), + (2,23,"CmbAccessibleProperty","cmb-a11y-property-label","Main Menu",0,None,None,None,None,None,None,None,None), + (2,23,"GtkPopoverMenuBar","menu-model","2",0,None,None,None,None,None,None,None,None), + (2,24,"CmbAccessibleProperty","cmb-a11y-property-label","Toolbar",0,None,None,None,None,None,None,None,None), + (2,24,"GtkAccessible","accessible-role","toolbar",0,None,None,None,None,None,None,None,None), + (2,24,"GtkWidget","css-classes","toolbar",0,None,None,None,None,None,None,None,None), + (2,25,"GtkActionable","action-name","win.new",0,None,None,None,None,None,None,None,None), + (2,25,"GtkButton","icon-name","document-new",0,None,None,None,None,None,None,None,None), + (2,25,"GtkButton","label","New",1,None,None,None,None,None,None,None,None), + (2,25,"GtkWidget","tooltip-text","Create a new file",1,None,None,None,None,None,None,None,None), + (2,26,"GtkActionable","action-name","win.open",0,None,None,None,None,None,None,None,None), + (2,26,"GtkButton","icon-name","document-open",0,None,None,None,None,None,None,None,None), + (2,26,"GtkButton","label","Open",1,None,None,None,None,None,None,None,None), + (2,26,"GtkWidget","tooltip-text","Open a file",1,None,None,None,None,None,None,None,None), + (2,27,"GtkActionable","action-name","win.save",0,None,None,None,None,None,None,None,None), + (2,27,"GtkButton","icon-name","document-save",0,None,None,None,None,None,None,None,None), + (2,27,"GtkButton","label","Save",1,None,None,None,None,None,None,None,None), + (2,27,"GtkWidget","tooltip-text","Save a file",1,None,None,None,None,None,None,None,None), + (2,29,"GtkActionable","action-name","win.copy",0,None,None,None,None,None,None,None,None), + (2,29,"GtkButton","icon-name","edit-copy",0,None,None,None,None,None,None,None,None), + (2,29,"GtkButton","label","Copy",1,None,None,None,None,None,None,None,None), + (2,29,"GtkWidget","tooltip-text","Copy selected object into the clipboard",1,None,None,None,None,None,None,None,None), + (2,30,"GtkActionable","action-name","win.cut",0,None,None,None,None,None,None,None,None), + (2,30,"GtkButton","icon-name","edit-cut",0,None,None,None,None,None,None,None,None), + (2,30,"GtkButton","label","Cut",1,None,None,None,None,None,None,None,None), + (2,30,"GtkWidget","tooltip-text","Cut selected object into the clipboard",1,None,None,None,None,None,None,None,None), + (2,31,"GtkActionable","action-name","win.paste",0,None,None,None,None,None,None,None,None), + (2,31,"GtkButton","icon-name","edit-paste",0,None,None,None,None,None,None,None,None), + (2,31,"GtkButton","label","Paste",1,None,None,None,None,None,None,None,None), + (2,31,"GtkWidget","tooltip-text","Paste object from the clipboard",1,None,None,None,None,None,None,None,None), + (2,32,"GtkScrolledWindow","has-frame","1",0,None,None,None,None,None,None,None,None), + (2,32,"GtkWidget","hexpand","1",0,None,None,None,None,None,None,None,None), + (2,32,"GtkWidget","vexpand","1",0,None,None,None,None,None,None,None,None), + (2,33,"GtkTreeView","model","1",0,None,None,None,None,None,None,None,None), + (2,33,"GtkTreeView","tooltip-column","3",0,None,None,None,None,None,None,None,None), + (2,34,"GtkTreeViewColumn","title","Name",0,None,None,None,None,None,None,None,None), + (2,36,"GtkTreeViewColumn","title","Surname",0,None,None,None,None,None,None,None,None), + (2,38,"GtkTreeViewColumn","title","Age",0,None,None,None,None,None,None,None,None), + (2,40,"GtkLabel","xalign","0",0,None,None,None,None,None,None,None,None), + (2,40,"GtkWidget","margin-bottom","2",0,None,None,None,None,None,None,None,None), + (2,40,"GtkWidget","margin-end","2",0,None,None,None,None,None,None,None,None), + (2,40,"GtkWidget","margin-start","2",0,None,None,None,None,None,None,None,None), + (2,40,"GtkWidget","margin-top","2",0,None,None,None,None,None,None,None,None) + + + (2,1,"GtkListStore",1,1,None,None,None,None,None,None), + (2,1,"GtkListStore",2,2,None,1,None,None,None,None), + (2,1,"GtkListStore",2,3,None,1,None,None,None,None), + (2,1,"GtkListStore",2,4,None,1,None,None,None,None), + (2,1,"GtkListStore",2,5,None,1,None,None,None,None), + (2,1,"GtkListStore",3,6,None,None,None,None,None,None), + (2,1,"GtkListStore",4,7,None,6,None,None,None,None), + (2,1,"GtkListStore",5,8,"John",7,None,None,None,None), + (2,1,"GtkListStore",5,9,"Doe",7,None,None,None,None), + (2,1,"GtkListStore",5,10,"25",7,None,None,None,None), + (2,1,"GtkListStore",5,11,"This is the John Doe row",7,None,None,None,None), + (2,1,"GtkListStore",4,12,None,6,None,None,None,None), + (2,1,"GtkListStore",5,13,"Mary",12,None,None,None,None), + (2,1,"GtkListStore",5,14,"Unknown",12,None,None,None,None), + (2,1,"GtkListStore",5,15,"50",12,None,None,None,None), + (2,1,"GtkListStore",5,16,"This is the Mary Unknown row",12,None,None,None,None) + + + (2,1,"GtkListStore",2,2,"type","gchararray"), + (2,1,"GtkListStore",2,3,"type","gchararray"), + (2,1,"GtkListStore",2,4,"type","gint"), + (2,1,"GtkListStore",2,5,"type","gchararray"), + (2,1,"GtkListStore",5,8,"id","0"), + (2,1,"GtkListStore",5,9,"id","1"), + (2,1,"GtkListStore",5,10,"id","2"), + (2,1,"GtkListStore",5,11,"id","3"), + (2,1,"GtkListStore",5,13,"id","0"), + (2,1,"GtkListStore",5,14,"id","1"), + (2,1,"GtkListStore",5,15,"id","2"), + (2,1,"GtkListStore",5,16,"id","3") + + diff --git a/src/ui/admin-dashboard.ui b/src/ui/admin-dashboard.ui deleted file mode 100644 index ae58bb3..0000000 --- a/src/ui/admin-dashboard.ui +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - 700 - 500 - True - A Drogon Content Manager - - - start - 3 - - - start - - - start - SharpeTronics - 5 - 5 - - 0 - 1 - 0 - 1 - - - - - - start - A Drogon Dashboard - 3 - 15 - 5 - - 0 - 1 - 2 - - - - - - start - GENERAL - 10 - 5 - 35 - - 0 - 8 - - - - - - - - start - text-x-generic - Content Manager - - - 5 - - 0 - 5 - - - - - - start - PLUGINS - 10 - 5 - 35 - - 0 - 6 - - - - - - - - start - image-x-generic - Media Library - - - 5 - - 0 - 7 - - - - - - 15 - - 0 - 3 - - - - - - - - start - application-x-addon-symbolic - Plugins - - - 5 - - 0 - 9 - - - - - - - - start - org.gnome.Settings-default-apps-symbolic - Marketplace - - - 5 - 5 - - 0 - 10 - - - - - - - - start - applications-system-symbolic - Settings - - - 5 - 5 - - 0 - 11 - - - - - - - - - - - - diff --git a/src/ui/admin-register.ui b/src/ui/admin-register.ui index db819f7..0b0b746 100644 --- a/src/ui/admin-register.ui +++ b/src/ui/admin-register.ui @@ -1,216 +1,223 @@ - - - - - - - - - - -1 - -1 - Admin Registration + + + + + + + + + + + + + John + Doe + 25 + This is the John Doe row + + + Mary + Unknown + 50 + This is the Mary Unknown row + + + + + + _File +
+ + _New + win.new + + + _Open + win.open + + + _Save + win.save + + + Save _As + win.save-as + +
+
+ + _Quit + win.quit + +
+
+ + _Edit +
+ + _Copy + win.copy + + + _Cut + win.cut + + + _Paste + win.paste + +
+
+ + _Help +
+ + _Help + win.help + + + _About + win.about + +
+
+
+ + Builder demo + org.gtk.Demo4 + True + + + 250 + 440 + Builder - - center - 500 - - - 7 - center - 5 - 450 + + vertical + + + menubar + + Main Menu + + + + + + toolbar + toolbar + + Toolbar + -