Merge lp:~ubunt-u-markbenjamin/indicator-applet/reorient into lp:indicator-applet/0.4

[MarkieB]

branch to address bugs #498182, #412111 to allow vertical orientation of indicator-applet-* applets;

so far no actual rotation of labels, simply vertical stacking of icons/widgets

patch introduces 2 relatively innocuous static globals [of Enums] to handle state during a session, would need additional code to allow persistence across sessions;

may need I18n;

features 'automatic' reorientation when the containing panel is moved, as well as 'override' in a new properties mini-window; current implementation is that 'automatic' reorientation causes a 90°* rotation however the override is set, override simply allows an 'offset' from the 'normal' rotation

* in fact there are 2 orientations, ltr, ttb; thinking that as we're talking images not words, ltr is equally acceptable in an rtl environment

further revisions should include
implementation of properties generally / persistence; see for instance #439775. #425552, #88963
actual rotation of labels [notably name] as happens for the main menu https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/498182/comments/2

As I'm new here, I dare say some of my coding style merits some review; I'll be looking into the I18n aspect as it's unclear precisely how that works here

[lp:~ubunt-u-markbenjamin/indicator-applet/reorient]

354. By MarkieB on 2010-04-16

variable multi-component orientation - needs desktop session restart to have effect though

355. By MarkieB on 2010-04-16

now multi-component orientation changes in a similar manner to the orientation of the various widgets contained in the applet, no need for panel restart

356. By MarkieB on 2010-04-16

add rotation of labels

357. By MarkieB on 2010-04-16

add I18n of labels in [tentative] prefs mini-window

[MarkieB (ubunt-u-markbenjamin)]

that should have been question #88963 not bug #88963 https://answers.launchpad.net/indicator-applet/+question/88963

[lp:~ubunt-u-markbenjamin/indicator-applet/reorient]

358. By MarkieB on 2010-04-16

label rotation according to preferences - as well as location

[Kevin Turner (keturn)]

Nice! This patch is sufficient to make the indicator applet functional on my vertical panel, I don't have the "Why don't I have a 'Log Out' button anymore?" experience with this.

I'd leave out the properties dialog for this branch. A user-configurable horizontal/vertical widget doesn't seem necessary if the applet correctly understands its orientation. (If you do leave it in, you've got an unused radio_group variable in properties_cb.)

Note that I'm not a maintainer, I'm just another user who with a vertical panel who would hate to see Lucid ship with this "hey where'd the volume panel widget go" bug.

[lp:~ubunt-u-markbenjamin/indicator-applet/reorient]

359. By MarkieB on 2010-04-18

without properties in current iteration

360. By MarkieB on 2010-04-18

more elegant handling of data connections when reorienting

361. By MarkieB on 2010-04-18

more elegant handling of data connections when reorienting - no need for the enum

362. By MarkieB on 2010-04-18

suppress spurious 'conflict' in header includes arising from merger 352.1.2

[MarkieB (ubunt-u-markbenjamin)]

> I'd leave out the properties dialog for this branch. A user-configurable
> horizontal/vertical widget doesn't seem necessary if the applet correctly
> understands its orientation. (If you do leave it in, you've got an unused
> radio_group variable in properties_cb.)

Done :-)

> Note that I'm not a maintainer, I'm just another user who with a vertical
> panel who would hate to see Lucid ship with this "hey where'd the volume panel
> widget go" bug.

Even the 'how do I switch the computer off' bug that was how I noticed it :-)

thanks for the comments

Best

Mark

[lp:~ubunt-u-markbenjamin/indicator-applet/reorient]

363. By MarkieB on 2010-04-19

resolve compiler warning changes

[Sense Egbert Hofstede (sense)]

After running './auotgen.sh' this branch fails when you try to run 'debuild' on my system. I'm using the Debian folder from lp:~ubuntu-desktop/indicator-application/ubuntu Should I change something to the packaging, or did this branch break the build?

This is the error I'm getting at the end of the 'debuild' output:

DEB_MAKE_CHECK_TARGET unset, not running checks
make -C build-python2.6/bindings/python
make: *** build-python2.6/bindings/python: File or folder doesn't exist. Stopped.
make: *** [build-stamp-python2.6] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
debuild: fatal error at line 1340:
dpkg-buildpackage -rfakeroot -D -us -uc failed

[Ted Gould (ted)]

MarkieB,

Looking through the code it looks like it's going in the right
direction. If you could merge trunk into your branch that should clean
up the conflict that I think is effecting Sense. I'd be nice to get a
clean diff to examine as well.

  --Ted

[MarkieB (ubunt-u-markbenjamin)]

Hi Ted,

I think I see the trouble; that I have derived the branch from / proposed merging to lp:indicator-applet, not from lp:~ubuntu-desktop/indicator-application/ubuntu ?

As there is no debian folder in the source tree I have, debuild reminds me of that :-) while the result of

$ bzr merge
Merging from remembered parent location http://bazaar.launchpad.net/~indicator-applet-developers/indicator-applet/applet/
Nothing to do.

[MarkieB (ubunt-u-markbenjamin)]

Most of all, it looks to me as though Sense's difficulty is that he's derived the debian folder from indicator-application/ubuntu, not indicator-applet/ubuntu, hence the python folder reference [inter alia]

$ get-build-deps indicator-application
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following NEW packages will be installed:
  cli-common-dev gtk-sharp2-gapi libffi-dev libglib2.0-cil-dev libgluezilla libgtk2.0-cil-dev
  libjson-glib-dev libmono-accessibility1.0-cil libmono-accessibility2.0-cil libmono-bytefx0.7.6.1-cil
  libmono-bytefx0.7.6.2-cil libmono-c5-1.0-cil libmono-cairo1.0-cil libmono-cecil-private-cil
  libmono-cil-dev libmono-corlib1.0-cil libmono-cscompmgd7.0-cil libmono-cscompmgd8.0-cil
  libmono-data-tds1.0-cil libmono-data1.0-cil libmono-data2.0-cil libmono-db2-1.0-cil libmono-dev
  libmono-getoptions1.0-cil libmono-getoptions2.0-cil libmono-i18n-west1.0-cil libmono-i18n1.0-cil
  libmono-i18n2.0-cil libmono-ldap1.0-cil libmono-ldap2.0-cil libmono-management2.0-cil
  libmono-messaging-rabbitmq2.0-cil libmono-messaging2.0-cil libmono-microsoft-build2.0-cil
  libmono-microsoft7.0-cil libmono-microsoft8.0-cil libmono-npgsql1.0-cil libmono-npgsql2.0-cil
  libmono-oracle1.0-cil libmono-oracle2.0-cil libmono-peapi1.0-cil libmono-peapi2.0-cil
  libmono-posix1.0-cil libmono-rabbitmq2.0-cil libmono-relaxng1.0-cil libmono-relaxng2.0-cil
  libmono-security1.0-cil libmono-sharpzip0.6-cil libmono-sharpzip0.84-cil libmono-sharpzip2.6-cil
  libmono-simd2.0-cil libmono-sqlite1.0-cil libmono-system-data1.0-cil libmono-system-ldap1.0-cil
  libmono-system-ldap2.0-cil libmono-system-messaging1.0-cil libmono-system-messaging2.0-cil
  libmono-system-runtime1.0-cil libmono-system-web-mvc1.0-cil libmono-system-web1.0-cil
  libmono-system1.0-cil libmono-wcf3.0-cil libmono-webbrowser0.5-cil libmono-winforms1.0-cil
  libmono-winforms2.0-cil libmono0 libmono1.0-cil libnunit-cil-dev libxml-dom-perl libxml-perl
  libxml-regexp-perl mono-2.0-devel mono-csharp-shell mono-devel mono-gmcs mono-utils python-all
  python-all-dev python-gobject-dev python-gtk2-dev python-gtk2-doc
0 upgraded, 81 newly installed, 0 to remove and 5 not upgraded.
Need to get 17.5MB of archives.
After this operation, 66.6MB of additional disk space will be used.

[MarkieB (ubunt-u-markbenjamin)]

@Sense, for a branch that should debuild [although it seems the changes to save compiler warnings / keybinder improvements are not yet implemented in that branch's parent]

try https://code.launchpad.net/~ubunt-u-markbenjamin/indicator-applet/reorient-ubuntu

you may need to change signing keys etcetera for debuild to complete successfully

@Ted, My thinking would be that the changes be merged into the master branch then normally the master branch would be merged [including the compiler warning changes] to the ubuntu package branch?

[Sense Egbert Hofstede (sense)]

Apologises for my mistake. The reason for debuild failing was very simple: I had copied the debian folder from 'indicator-application', whereas your branch is 'indicator-applet'.

I've now been able to test it and I can say it works perfectly. I'm reviewing this as 'Approved' to indicate my approval, but please don't think I have anything to say about this, I'm not a member of the development team. ;)

review: Approve

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2010-04-16 19:56:30 +0000
+++ src/applet-main.c	2010-04-19 02:24:24 +0000
@@ -38,6 +38,9 @@
 	NULL
 };
 
+static GtkPackDirection packdirection;
+static PanelAppletOrient orient;
+
 #define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
 #define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
 
@@ -45,7 +48,6 @@
 
 static gboolean     applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
 
-
 static void cw_panel_background_changed (PanelApplet               *applet,
                                          PanelAppletBackgroundType  type,
                         				         GdkColor                  *colour,
@@ -178,23 +180,37 @@
 }
 
 static void
-entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menu)
+entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
 	g_debug("Signal: Entry Added");
 
 	GtkWidget * menuitem = gtk_menu_item_new();
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
+	GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+			gtk_hbox_new(FALSE, 3) : gtk_vbox_new(FALSE, 3);
 
-        g_object_set_data (G_OBJECT (menuitem), "indicator", io);
+	g_object_set_data (G_OBJECT (menuitem), "indicator", io);
+	g_object_set_data (G_OBJECT (menuitem), "box", box);
 
 	if (entry->image != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
 	}
 	if (entry->label != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
+		switch(packdirection) {
+			case GTK_PACK_DIRECTION_LTR:
+				gtk_label_set_angle(GTK_LABEL(entry->label), 0.0);
+				break;
+			case GTK_PACK_DIRECTION_TTB:
+				gtk_label_set_angle(GTK_LABEL(entry->label),
+						(orient == PANEL_APPLET_ORIENT_LEFT) ? 
+						270.0 : 90.0);
+				break;
+			default:
+				break;
+		}		
+		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
 	}
-	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-	gtk_widget_show(hbox);
+	gtk_container_add(GTK_CONTAINER(menuitem), box);
+	gtk_widget_show(box);
 
 	if (entry->menu != NULL) {
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
@@ -206,9 +222,9 @@
 	position.menupos = 0;
 	position.found = FALSE;
 
-	gtk_container_foreach(GTK_CONTAINER(menu), place_in_menu, &position);
+	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
 
-	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, position.menupos);
+	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
 	gtk_widget_show(menuitem);
 
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
@@ -264,13 +280,13 @@
 entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry,
              gint old G_GNUC_UNUSED, gint new G_GNUC_UNUSED, gpointer user_data)
 {
-	GtkWidget * menu = GTK_WIDGET(user_data);
+	GtkWidget * menubar = GTK_WIDGET(user_data);
 
 	gpointer array[2];
 	array[0] = entry;
 	array[1] = NULL;
 
-	gtk_container_foreach(GTK_CONTAINER(user_data), entry_moved_find_cb, array);
+	gtk_container_foreach(GTK_CONTAINER(menubar), entry_moved_find_cb, array);
 	if (array[1] == NULL) {
 		g_warning("Moving an entry that isn't in our menus.");
 		return;
@@ -278,7 +294,7 @@
 
 	GtkWidget * mi = GTK_WIDGET(array[1]);
 	g_object_ref(G_OBJECT(mi));
-	gtk_container_remove(GTK_CONTAINER(user_data), mi);
+	gtk_container_remove(GTK_CONTAINER(menubar), mi);
 
 	incoming_position_t position;
 	position.objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
@@ -286,16 +302,16 @@
 	position.menupos = 0;
 	position.found = FALSE;
 
-	gtk_container_foreach(GTK_CONTAINER(menu), place_in_menu, &position);
+	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
 
-	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), mi, position.menupos);
+	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), mi, position.menupos);
 	g_object_unref(G_OBJECT(mi));
 
 	return;
 }
 
 static gboolean
-load_module (const gchar * name, GtkWidget * menu)
+load_module (const gchar * name, GtkWidget * menubar)
 {
 	g_debug("Looking at Module: %s", name);
 	g_return_val_if_fail(name != NULL, FALSE);
@@ -314,10 +330,10 @@
 	/* Attach the 'name' to the object */
 	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
 
-	/* Connect to it's signals */
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menu);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menu);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menu);
+	/* Connect to its signals */
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menubar);
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menubar);
 
 	/* Work on the entries */
 	GList * entries = indicator_object_get_entries(io);
@@ -325,7 +341,7 @@
 
 	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
 		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
-		entry_added(io, entrydata, menu);
+		entry_added(io, entrydata, menubar);
 	}
 
 	g_list_free(entries);
@@ -445,6 +461,72 @@
 	return;
 }
 
+static gboolean
+swap_orient_cb (GtkWidget *item, gpointer data)
+{
+	GtkWidget *from = (GtkWidget *) data;
+	GtkWidget *to = (GtkWidget *) g_object_get_data(G_OBJECT(from), "to");
+	g_object_ref(G_OBJECT(item));
+	gtk_container_remove(GTK_CONTAINER(from), item);
+	if (GTK_IS_LABEL(item)) {
+			switch(packdirection) {
+			case GTK_PACK_DIRECTION_LTR:
+				gtk_label_set_angle(GTK_LABEL(item), 0.0);
+				break;
+			case GTK_PACK_DIRECTION_TTB:
+				gtk_label_set_angle(GTK_LABEL(item),
+						(orient == PANEL_APPLET_ORIENT_LEFT) ? 
+						270.0 : 90.0);
+				break;
+			default:
+				break;
+		}		
+	}
+	gtk_box_pack_start(GTK_BOX(to), item, FALSE, FALSE, 0);
+	return TRUE;
+}
+
+static gboolean
+reorient_box_cb (GtkWidget *menuitem, gpointer data)
+{
+	GtkWidget *from = g_object_get_data(G_OBJECT(menuitem), "box");
+	GtkWidget *to = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+			gtk_hbox_new(FALSE, 0) : gtk_vbox_new(FALSE, 0);
+	g_object_set_data(G_OBJECT(from), "to", to);
+	gtk_container_foreach(GTK_CONTAINER(from), (GtkCallback)swap_orient_cb,
+			from);
+	gtk_container_remove(GTK_CONTAINER(menuitem), from);
+	gtk_container_add(GTK_CONTAINER(menuitem), to);
+	g_object_set_data(G_OBJECT(menuitem), "box", to);
+	gtk_widget_show_all(menuitem);
+	return TRUE;
+}
+
+static gboolean
+panelapplet_reorient_cb (GtkWidget *applet, PanelAppletOrient neworient,
+		gpointer data)
+{
+	GtkWidget *menubar = (GtkWidget *)data;
+	if ((((neworient == PANEL_APPLET_ORIENT_UP) || 
+			(neworient == PANEL_APPLET_ORIENT_DOWN)) && 
+			((orient == PANEL_APPLET_ORIENT_LEFT) || 
+			(orient == PANEL_APPLET_ORIENT_RIGHT))) || 
+			(((neworient == PANEL_APPLET_ORIENT_LEFT) || 
+			(neworient == PANEL_APPLET_ORIENT_RIGHT)) && 
+			((orient == PANEL_APPLET_ORIENT_UP) ||
+			(orient == PANEL_APPLET_ORIENT_DOWN)))) {
+		packdirection = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+				GTK_PACK_DIRECTION_TTB : GTK_PACK_DIRECTION_LTR;
+		gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
+				packdirection);
+		orient = neworient;
+		gtk_container_foreach(GTK_CONTAINER(menubar),
+				(GtkCallback)reorient_box_cb, NULL);
+	}
+	orient = neworient;
+	return FALSE;
+}
+
 #ifdef N_
 #undef N_
 #endif
@@ -519,9 +601,9 @@
 			"<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>"
 		"</popup>";
 
+	static gboolean first_time = FALSE;
 	GtkWidget *menubar;
 	gint indicators_loaded = 0;
-	static gboolean first_time = FALSE;
 
 #ifdef INDICATOR_APPLET_SESSION
 	/* check if we are running stracciatella session */
@@ -552,7 +634,8 @@
 	/* Set panel options */
 	gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
 	panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
-	panel_applet_setup_menu(applet, menu_xml, menu_verbs, NULL);
+	menubar = gtk_menu_bar_new();
+	panel_applet_setup_menu(applet, menu_xml, menu_verbs, menubar);
 #ifdef INDICATOR_APPLET
 	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
 	                     "indicator-applet");
@@ -599,12 +682,19 @@
 	gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
 
 	/* Build menubar */
-	menubar = gtk_menu_bar_new();
+	orient = (panel_applet_get_orient(applet));
+	packdirection = ((orient == PANEL_APPLET_ORIENT_UP) ||
+			(orient == PANEL_APPLET_ORIENT_DOWN)) ? 
+			GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB;
+	gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
+			packdirection);
 	GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);
 	gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
 	g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
         g_signal_connect(menubar, "scroll-event", G_CALLBACK (menubar_scroll), NULL);
 	g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
+	g_signal_connect(applet, "change-orient", 
+			G_CALLBACK(panelapplet_reorient_cb), menubar);
 	gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
 
 	/* Add in filter func */
@@ -654,6 +744,7 @@
 	gtk_widget_show(GTK_WIDGET(applet));
 
 	return TRUE;
+
 }
 
 static void