diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-24 01:40:13 +0530 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-11-28 17:53:47 +0100 |
commit | 58b1efba272d76b1c3a9c0866af76375f0320f2f (patch) | |
tree | ec86e0134ca9fd04c4ba7cacf02913d767f35f59 /libreofficekit | |
parent | cf2443a12681f23850cfe9439a4dec680821c61a (diff) |
gtv: Kill dialog selector combo box
Change-Id: I2cd27dff95f2bc49a15ab395b8282b5496e1e229
Diffstat (limited to 'libreofficekit')
-rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 23 | ||||
-rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv.ui | 16 |
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 e0268527687e..2c39b939ceeb 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")); @@ -180,22 +177,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) { @@ -222,8 +203,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 1b7779f59f2f..e27f79714a4b 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> |