[gedit-latex] Put justify actions in toolbar menu on combined toolbar

[John Stowers <jstowers src gnome org>]

commit a888e8f869d801dc1f20a094699ae510cc6f5784
Author: John Stowers <john stowers gmail com>
Date:   Thu Aug 18 13:35:25 2011 +1200

    Put justify actions in toolbar menu on combined toolbar

 data/ui/ui-toolbar-combined.builder |   10 +++++++---
 latex/base/config.py                |    2 ++
 latex/latex/actions.py              |   11 +++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/data/ui/ui-toolbar-combined.builder b/data/ui/ui-toolbar-combined.builder
index d8e0c00..0c2ca94 100644
--- a/data/ui/ui-toolbar-combined.builder
+++ b/data/ui/ui-toolbar-combined.builder
@@ -44,9 +44,13 @@
                 <menuitem action="LaTeXFrakturAction" />
             </menu>
         </toolitem>
-        <toolitem action="LaTeXJustifyLeftAction" />
-        <toolitem action="LaTeXJustifyCenterAction" />
-        <toolitem action="LaTeXJustifyRightAction" />
+        <toolitem action="LaTeXJustifyActionDefault">
+            <menu action="LaTeXJustifyMenuAction">
+                <menuitem action="LaTeXJustifyLeftAction" />
+                <menuitem action="LaTeXJustifyCenterAction" />
+                <menuitem action="LaTeXJustifyRightAction" />
+            </menu>
+        </toolitem>
         <separator />
         <toolitem action="LaTeXItemizeAction" />
         <toolitem action="LaTeXEnumerateAction" />
diff --git a/latex/base/config.py b/latex/base/config.py
index 18ac48b..7072e15 100644
--- a/latex/base/config.py
+++ b/latex/base/config.py
@@ -29,6 +29,7 @@ from ..latex.actions import LaTeXMenuAction, LaTeXNewAction, LaTeXChooseMasterAc
         LaTeXItalicAction, LaTeXEmphasizeAction, LaTeXDescriptionAction, LaTeXStructureMenuAction, LaTeXPartAction, LaTeXChapterAction, \
         LaTeXSectionAction, LaTeXSubsectionAction, LaTeXParagraphAction, LaTeXSubparagraphAction, LaTeXStructureActionDefault, \
         LaTeXGraphicsAction, LaTeXUseBibliographyAction, LaTeXTableAction, LaTeXListingAction, LaTeXJustifyLeftAction, \
+        LaTeXJustifyMenuAction, LaTeXJustifyActionDefault, \
         LaTeXJustifyCenterAction, LaTeXJustifyRightAction, LaTeXMathMenuAction, LaTeXMathActionDefault, LaTeXMathAction, LaTeXDisplayMathAction, \
         LaTeXEquationAction, LaTeXUnEqnArrayAction, LaTeXEqnArrayAction, LaTeXUnderlineAction, LaTeXSmallCapitalsAction, \
         LaTeXRomanAction, LaTeXSansSerifAction, LaTeXTypewriterAction, LaTeXCloseEnvironmentAction, LaTeXBlackboardBoldAction, \
@@ -42,6 +43,7 @@ ACTIONS = [LaTeXMenuAction, LaTeXNewAction, LaTeXChooseMasterAction,
         LaTeXItalicAction, LaTeXEmphasizeAction, LaTeXDescriptionAction, LaTeXStructureMenuAction, LaTeXPartAction, LaTeXChapterAction,
         LaTeXSectionAction, LaTeXSubsectionAction, LaTeXParagraphAction, LaTeXSubparagraphAction, LaTeXStructureActionDefault,
         LaTeXGraphicsAction, LaTeXUseBibliographyAction, LaTeXTableAction, LaTeXListingAction, LaTeXJustifyLeftAction,
+        LaTeXJustifyMenuAction, LaTeXJustifyActionDefault,
         LaTeXJustifyCenterAction, LaTeXJustifyRightAction, LaTeXMathMenuAction, LaTeXMathActionDefault, LaTeXMathAction, LaTeXDisplayMathAction,
         LaTeXEquationAction, LaTeXUnEqnArrayAction, LaTeXEqnArrayAction, LaTeXUnderlineAction, LaTeXSmallCapitalsAction,
         LaTeXRomanAction, LaTeXSansSerifAction, LaTeXTypewriterAction, LaTeXCloseEnvironmentAction, LaTeXBlackboardBoldAction,
diff --git a/latex/latex/actions.py b/latex/latex/actions.py
index 9db6aac..5d78a69 100644
--- a/latex/latex/actions.py
+++ b/latex/latex/actions.py
@@ -425,6 +425,11 @@ class LaTeXBuildImageAction(LaTeXIconAction):
                 ToolRunner().run(context.active_editor.file, tool, tool_view)
 
 
+class LaTeXJustifyMenuAction(LaTeXMenuAction):
+    label = "Justify"
+    tooltip = "Justify"
+
+
 class LaTeXJustifyLeftAction(LaTeXTemplateAction):
     label = "Justify Left"
     tooltip = "Justify Left"
@@ -439,6 +444,12 @@ class LaTeXJustifyCenterAction(LaTeXTemplateAction):
     template_source = "\\begin{center}$_\\end{center}"
 
 
+class LaTeXJustifyActionDefault(LaTeXJustifyCenterAction):
+    menu_tool_action = True
+    label = "Justify"
+    tooltip = "Justify"
+
+
 class LaTeXJustifyRightAction(LaTeXTemplateAction):
     label = "Justify Right"
     tooltip = "Justify Right"