From d2e339a8aff78e68c26125440f58de3cad1c0247 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 10:11:25 +0100 Subject: [PATCH 01/12] Rotate UI so it is horizontal I have no experience writing GTK apps. I hope this works. Once i have done this i will work on making it a command line option. --- resources/ui.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ui.glade b/resources/ui.glade index 6770734..eceb75d 100644 --- a/resources/ui.glade +++ b/resources/ui.glade @@ -65,7 +65,7 @@ 16 16 16 - vertical + horizon 8 From b37cbede793b2c312385155f3429516927f23c68 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 10:14:35 +0100 Subject: [PATCH 02/12] Fixed typo Still not tested (i hope it works!) --- resources/ui.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ui.glade b/resources/ui.glade index eceb75d..6b2d0d5 100644 --- a/resources/ui.glade +++ b/resources/ui.glade @@ -65,7 +65,7 @@ 16 16 16 - horizon + horizontal 8 From 5ec5df32fc51bdfb8ddbe1165f870a3042490e24 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 18:56:18 +0100 Subject: [PATCH 03/12] Made grid go left->right instead of top->bottom --- resources/ui.glade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/ui.glade b/resources/ui.glade index 6b2d0d5..5a1af25 100644 --- a/resources/ui.glade +++ b/resources/ui.glade @@ -65,7 +65,7 @@ 16 16 16 - horizontal + vertical 8 @@ -92,8 +92,8 @@ none - 0 - 1 + 1 + 0 @@ -106,8 +106,8 @@ none - 0 - 2 + 2 + 0 @@ -120,8 +120,8 @@ none - 0 - 3 + 3 + 0 From 0393017739229beaffab8f1ccfdea344a3f924ce Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 19:06:42 +0100 Subject: [PATCH 04/12] separate files for vertical and horizontal This will allow the layout to be determined from the command line --- resources/{ui.glade => ui-horizontal.glade} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/{ui.glade => ui-horizontal.glade} (100%) diff --git a/resources/ui.glade b/resources/ui-horizontal.glade similarity index 100% rename from resources/ui.glade rename to resources/ui-horizontal.glade From b2bdeace4163705251c470006a772d3aef97fe9c Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 19:07:58 +0100 Subject: [PATCH 05/12] Create ui-vertical.glade --- resources/ui-vertical.glade | 149 ++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 resources/ui-vertical.glade diff --git a/resources/ui-vertical.glade b/resources/ui-vertical.glade new file mode 100644 index 0000000..5a1af25 --- /dev/null +++ b/resources/ui-vertical.glade @@ -0,0 +1,149 @@ + + + + + + True + False + /shutdown-dialog/close.png + + + True + False + 16 + 16 + 16 + 16 + /shutdown-dialog/logout.png + + + True + False + 16 + 16 + 16 + 16 + /shutdown-dialog/reboot.png + + + True + False + 16 + 16 + 16 + 16 + /shutdown-dialog/shutdown.png + + + True + False + 16 + 16 + 16 + 16 + /shutdown-dialog/suspend.png + + + True + GDK_KEY_PRESS_MASK | GDK_STRUCTURE_MASK + popup + center-always + True + False + + + + + + True + False + + + True + False + 16 + 16 + 16 + 16 + vertical + 8 + + + shutdown + True + True + True + True + shutdown + none + + + 0 + 0 + + + + + reboot + True + True + True + reboot + none + + + 1 + 0 + + + + + suspend + True + True + True + suspend + none + + + 2 + 0 + + + + + logout + True + True + True + logout + none + + + 3 + 0 + + + + + -1 + + + + + close + True + False + True + end + start + 2 + 2 + close + none + + + + + + From 87ea09dfa80dedb9aef062e2ce487e8b784a6bb4 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 19:27:57 +0100 Subject: [PATCH 06/12] Added command line options This is my first attempt at C so i hope it works :) --- shutdown-dialog.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/shutdown-dialog.c b/shutdown-dialog.c index ab4a71f..8330bc0 100644 --- a/shutdown-dialog.c +++ b/shutdown-dialog.c @@ -14,8 +14,19 @@ int main(int argc, char *argv[]) { GtkWidget *window, *btn_close, *btn_shutdown, *btn_reboot, *btn_suspend, *btn_logout; gtk_init(&argc, &argv); - - builder = gtk_builder_new_from_resource("/shutdown-dialog/ui.glade"); + + int opt; + + //Options here + while ((opt = getopt(argc, argv, "vh")) != -1) { + switch (opt) { + case 'v': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; + case 'h': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); break; + default: + builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); + } + } + window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); btn_close = GTK_WIDGET(gtk_builder_get_object(builder, "close-button")); btn_shutdown = GTK_WIDGET(gtk_builder_get_object(builder, "shutdown-button")); From 59f3f47d8b8303a0ecd8ac6e8a91fc63c40aadf1 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 19:29:43 +0100 Subject: [PATCH 07/12] Fixed something i missed --- shutdown-dialog.gresource.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shutdown-dialog.gresource.xml b/shutdown-dialog.gresource.xml index f9b318e..167237a 100644 --- a/shutdown-dialog.gresource.xml +++ b/shutdown-dialog.gresource.xml @@ -1,7 +1,8 @@ - ui.glade + ui-vertical.glade + ui-horizontal.glade close.png shutdown.png reboot.png From f47caa395f57871cb757966b8b74ad90a172c1f4 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 19:40:44 +0100 Subject: [PATCH 08/12] nicer to read --- shutdown-dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shutdown-dialog.c b/shutdown-dialog.c index 8330bc0..66501d5 100644 --- a/shutdown-dialog.c +++ b/shutdown-dialog.c @@ -20,8 +20,10 @@ int main(int argc, char *argv[]) { //Options here while ((opt = getopt(argc, argv, "vh")) != -1) { switch (opt) { - case 'v': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; - case 'h': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); break; + case 'v': + builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; + case 'h': + builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); break; default: builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); } From e29a015418418d7d2785836fc2df8568d5f6c803 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 20:29:13 +0100 Subject: [PATCH 09/12] Layout was wrong way --- resources/ui-vertical.glade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/ui-vertical.glade b/resources/ui-vertical.glade index 5a1af25..6770734 100644 --- a/resources/ui-vertical.glade +++ b/resources/ui-vertical.glade @@ -92,8 +92,8 @@ none - 1 - 0 + 0 + 1 @@ -106,8 +106,8 @@ none - 2 - 0 + 0 + 2 @@ -120,8 +120,8 @@ none - 3 - 0 + 0 + 3 From 6a216f71a7c22fee07428340ec12febace7c9e67 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 20:31:33 +0100 Subject: [PATCH 10/12] Fixed problem of no default --- shutdown-dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shutdown-dialog.c b/shutdown-dialog.c index 66501d5..7fd26bc 100644 --- a/shutdown-dialog.c +++ b/shutdown-dialog.c @@ -17,6 +17,9 @@ int main(int argc, char *argv[]) { int opt; + //Defaults + builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); + //Options here while ((opt = getopt(argc, argv, "vh")) != -1) { switch (opt) { @@ -24,9 +27,6 @@ int main(int argc, char *argv[]) { builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; case 'h': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); break; - default: - builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); - } } window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); From d7a02b3dccf30b753d4a59f419b9d1ee0d75b423 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 20:33:22 +0100 Subject: [PATCH 11/12] Remove mismatched statements --- shutdown-dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shutdown-dialog.c b/shutdown-dialog.c index 7fd26bc..3c4f105 100644 --- a/shutdown-dialog.c +++ b/shutdown-dialog.c @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { case 'v': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; case 'h': - builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); break; + builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); } window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); From ee00b9b8ee705e0be020334e56586bd62b0603a8 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 20 Aug 2019 20:36:47 +0100 Subject: [PATCH 12/12] Closed statement --- shutdown-dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/shutdown-dialog.c b/shutdown-dialog.c index 3c4f105..f4bad8e 100644 --- a/shutdown-dialog.c +++ b/shutdown-dialog.c @@ -27,6 +27,7 @@ int main(int argc, char *argv[]) { builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-vertical.glade"); break; case 'h': builder = gtk_builder_new_from_resource("/shutdown-dialog/ui-horizontal.glade"); + } } window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));