summaryrefslogtreecommitdiff
path: root/libreofficekit
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2017-11-24 01:40:13 +0530
committerAndras Timar <andras.timar@collabora.com>2018-03-19 14:55:34 +0100
commitb4d7813c656ce390a61c551182947ab21d1e7708 (patch)
tree20bd718248c73f48231ff9f79c0ebaf8b478a56f /libreofficekit
parentbcf7b404d24b55677adef1d938fa38487b94e62d (diff)
gtv: Kill dialog selector combo box
Change-Id: I2cd27dff95f2bc49a15ab395b8282b5496e1e229 (cherry picked from commit faf01731b20b96c2863b7a26277472cb47bb544a)
Diffstat (limited to 'libreofficekit')
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx23
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv.ui16
2 files changed, 1 insertions, 38 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index 33e454808ed2..d973d32551d6 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -35,7 +35,6 @@ struct GtvMainToolbarPrivateImpl
GtkWidget* m_pDeleteComment;
GtkWidget* m_pPartSelector;
GtkWidget* m_pPartModeSelector;
- GtkWidget* m_pDialogSelector;
/// Sensitivity (enabled or disabled) for each tool item, ignoring edit state
std::map<GtkToolItem*, bool> m_aToolItemSensitivities;
@@ -50,8 +49,7 @@ struct GtvMainToolbarPrivateImpl
m_pJustifypara(nullptr),
m_pDeleteComment(nullptr),
m_pPartSelector(nullptr),
- m_pPartModeSelector(nullptr),
- m_pDialogSelector(nullptr)
+ m_pPartModeSelector(nullptr)
{ }
};
@@ -98,7 +96,6 @@ gtv_main_toolbar_init(GtvMainToolbar* toolbar)
priv->m_pDeleteComment = GTK_WIDGET(gtk_builder_get_object(builder.get(), "btn_removeannotation"));
priv->m_pPartSelector = GTK_WIDGET(gtk_builder_get_object(builder.get(), "combo_partselector"));
priv->m_pPartModeSelector = GTK_WIDGET(gtk_builder_get_object(builder.get(), "combo_partsmodeselector"));
- priv->m_pDialogSelector = GTK_WIDGET(gtk_builder_get_object(builder.get(), "combo_dialogselector"));
toolbar->m_pAddressbar = GTK_WIDGET(gtk_builder_get_object(builder.get(), "addressbar_entry"));
toolbar->m_pFormulabar = GTK_WIDGET(gtk_builder_get_object(builder.get(), "formulabar_entry"));
@@ -181,22 +178,6 @@ static void populatePartSelector(GtvMainToolbar* toolbar)
gtv_application_window_set_part_broadcast(window, true);
}
-static void populateDialogSelector(GtvMainToolbar* toolbar)
-{
- GtvMainToolbarPrivate& priv = getPrivate(toolbar);
-
- GtkComboBoxText* pSelector = GTK_COMBO_BOX_TEXT(priv->m_pDialogSelector);
- gtk_combo_box_text_append_text( pSelector, ".uno:SearchDialog" );
- gtk_combo_box_text_append_text( pSelector, ".uno:AcceptTrackedChanges" );
- gtk_combo_box_text_append_text( pSelector, ".uno:SpellingAndGrammarDialog" );
- gtk_combo_box_text_append_text( pSelector, ".uno:InsertField" );
- gtk_combo_box_text_append_text( pSelector, ".uno:ImageMapDialog" );
- gtk_combo_box_text_append_text( pSelector, ".uno:WordCountDialog" );
- gtk_combo_box_text_append_text( pSelector, ".uno:HyperlinkDialog" );
- gtk_combo_box_text_append_text( pSelector, ".uno:InsertIndexesEntry" );
- gtk_combo_box_text_append_text( pSelector, ".uno:InsertAuthoritiesEntry");
-}
-
void
gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocumentType eDocType, bool bEditMode)
{
@@ -223,8 +204,6 @@ gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocumentType
// populate combo boxes
populatePartSelector(toolbar);
- // populate dialogs
- populateDialogSelector(toolbar);
}
GtkContainer*
diff --git a/libreofficekit/qa/gtktiledviewer/gtv.ui b/libreofficekit/qa/gtktiledviewer/gtv.ui
index c8699b33cd5e..966c97e46967 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv.ui
+++ b/libreofficekit/qa/gtktiledviewer/gtv.ui
@@ -445,22 +445,6 @@
</packing>
</child>
<child>
- <object class="GtkToolItem" id="dialogselectortoolitem">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkComboBoxText" id="combo_dialogselector">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<object class="GtkToggleToolButton" id="btn_editmode">
<property name="visible">True</property>
<property name="can_focus">False</property>