Merge lp:~evfool/midori/lp1263281 into lp:midori

[Robert Roth]

Use GtkStackSwitcher with GTK+ >= 3.10

This branch does the following:
* defines a USE_STACK_SWITCHER cmake option (requiring USE_GTK3)
* if it is defined, katze-preferences.h undefines it, and redefines it based on the gtk version (>=3.10 required) and osx (osx uses a toolbar instead of the notebook tabs for navigation, and to keep that behaviour, I have decided to make it depend on that value)
* if after all this, USE_STACK_SWITCHER evaluates to true, instead of notebook tabs, stackswitcher and a stack is used for navigation.

[lp:~evfool/midori/lp1263281]

6561. By Launchpad Translations on behalf of midori on 2014-02-22

Launchpad automatic translations update.

6562. By Paweł Forysiuk on 2014-02-22

Don't bother adblocking internal pages and favicons

6563. By Robert Roth on 2014-02-22

Display locationbar suggestions in the correct order

6564. By Launchpad Translations on behalf of midori on 2014-02-23

Launchpad automatic translations update.

6565. By Launchpad Translations on behalf of midori on 2014-02-24

Launchpad automatic translations update.

6566. By Cris Dywan on 2014-02-24

Don't use unix-specific semantics for get_extension_config_dir

6567. By Paweł Forysiuk on 2014-02-24

Fix building with newer mingw versions

6568. By Launchpad Translations on behalf of midori on 2014-02-25

Launchpad automatic translations update.

6569. By Cris Dywan on 2014-02-25

Implement Open With extension dealing with file types

6570. By Paweł Forysiuk on 2014-02-26

Make cmake build code before processing data and translations

6571. By Launchpad Translations on behalf of midori on 2014-02-26

Launchpad automatic translations update.

[Cris Dywan (kalikiana)]

Can we have it enabled based on the GTK+ version? A new build flag is most likely not going to be picked up by packagers or testers and past experience shows that every flag can cost us heavily in bug fixing later.

I'll report back shortly on how the testing goes.

review: Needs Information

[Cris Dywan (kalikiana)]

Something's off: the row of buttons clings to the top left, and maybe the padding depends on theme but: if I enlarge the window there's a huge gap between the window titlebar and the row of buttons.

[lp:~evfool/midori/lp1263281]

6572. By André Auzi on 2014-02-26

Implements context popup menu on menu entries of bookmark bar and bookmark menu.

6573. By Launchpad Translations on behalf of midori on 2014-02-27

Launchpad automatic translations update.

6574. By Launchpad Translations on behalf of midori on 2014-02-28

Launchpad automatic translations update.

[Robert Roth (evfool)]

Updated the branch:
* now stackswitcher in preferences is enabled for non-OSX systems on GTK>3.10.0
* fixed large gap between buttons and titlebar
* centered the stackswitcher in the window
I hopefully have addressed all your concerns, could I get another review?

[lp:~evfool/midori/lp1263281]

6575. By Launchpad Translations on behalf of midori on 2014-03-01

Launchpad automatic translations update.

[Cris Dywan (kalikiana)]

Nice! Thanks a lot for the improvements. The version detection seems to work well.

review: Approve

[lp:~evfool/midori/lp1263281]

6576. By Robert Roth on 2014-03-01

Use GtkStackSwitcher with GTK+ >= 3.10

=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c	2013-12-09 20:17:51 +0000
+++ katze/katze-preferences.c	2014-02-28 22:38:24 +0000
@@ -143,8 +143,12 @@
 katze_preferences_prepare (KatzePreferences* preferences)
 {
     KatzePreferencesPrivate* priv = preferences->priv;
-
+    
+    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+    priv->notebook = gtk_stack_new ();
+    #else
     priv->notebook = gtk_notebook_new ();
+    #endif
     gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
 
     #if HAVE_OSX
@@ -156,7 +160,16 @@
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
     #else
-    priv->toolbar = NULL;
+    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+        priv->toolbar = gtk_stack_switcher_new ();
+        gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (priv->toolbar), GTK_STACK (priv->notebook));
+        gtk_widget_set_halign (priv->toolbar, GTK_ALIGN_CENTER);
+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
+                        priv->toolbar, FALSE, FALSE, 0);
+    #else
+        priv->toolbar = NULL;
+    #endif
+
     #endif
     priv->toolbutton = NULL;
     gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
@@ -219,8 +232,15 @@
     priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     gtk_widget_show (priv->page);
     gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
+    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+    gtk_stack_add_titled (GTK_STACK (priv->notebook), 
+                         priv->page, label, label);
+    #else
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
                               priv->page, gtk_label_new (label));
+
+    #endif
+
     #if HAVE_OSX
     priv->toolbutton = GTK_WIDGET (priv->toolbutton ?
         gtk_radio_tool_button_new_from_widget (