|
 |
f325b2 |
From dbf2d5061ddcf8528b1e6e9944ea159fe5ea6afd Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 15 Sep 2015 12:10:03 +0200
|
|
|
f325b2 |
Subject: [PATCH 127/398] gtktiledviewer: allow multiple status bars
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I84c4102937deee662814c41607ee8de380a067f2
|
|
|
f325b2 |
(cherry picked from commit 36fa8d443a9ad87ee7077be7263870fab9dd6261)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 18 ++++++++++++------
|
|
|
f325b2 |
1 file changed, 12 insertions(+), 6 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index 096458a93dce..2559d124c72a 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -30,7 +30,6 @@ static int help()
|
|
|
f325b2 |
return 1;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-static GtkWidget* pStatusBar;
|
|
|
f325b2 |
static GtkToolItem* pEnableEditing;
|
|
|
f325b2 |
static GtkToolItem* pBold;
|
|
|
f325b2 |
static GtkToolItem* pItalic;
|
|
|
f325b2 |
@@ -49,13 +48,16 @@ static GtkWidget* pFindbar;
|
|
|
f325b2 |
static GtkWidget* pFindbarEntry;
|
|
|
f325b2 |
static GtkWidget* pFindbarLabel;
|
|
|
f325b2 |
|
|
|
f325b2 |
+/// Represents all the state that is specific to one GtkWindow of this app.
|
|
|
f325b2 |
class TiledWindow
|
|
|
f325b2 |
{
|
|
|
f325b2 |
public:
|
|
|
f325b2 |
GtkWidget* m_pDocView;
|
|
|
f325b2 |
+ GtkWidget* m_pStatusBar;
|
|
|
f325b2 |
|
|
|
f325b2 |
TiledWindow()
|
|
|
f325b2 |
- : m_pDocView(0)
|
|
|
f325b2 |
+ : m_pDocView(0),
|
|
|
f325b2 |
+ m_pStatusBar(0)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
}
|
|
|
f325b2 |
};
|
|
|
f325b2 |
@@ -461,8 +463,10 @@ static void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-static void removeChildrenFromStatusbar(GtkWidget* children, gpointer)
|
|
|
f325b2 |
+static void removeChildrenFromStatusbar(GtkWidget* children, gpointer pData)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ GtkWidget* pStatusBar = static_cast<GtkWidget*>(pData);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
gtk_container_remove(GTK_CONTAINER(pStatusBar), children);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -490,6 +494,7 @@ static void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ )
|
|
|
f325b2 |
static void openDocumentCallback (GObject* source_object, GAsyncResult* res, gpointer /*userdata*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
|
|
|
f325b2 |
+ TiledWindow& rWindow = lcl_getTiledWindow(GTK_WIDGET(pDocView));
|
|
|
f325b2 |
GError* error = NULL;
|
|
|
f325b2 |
GList *focusChain = NULL;
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -508,7 +513,7 @@ static void openDocumentCallback (GObject* source_object, GAsyncResult* res, gpo
|
|
|
f325b2 |
focusChain = g_list_append( focusChain, pDocView );
|
|
|
f325b2 |
gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
|
|
|
f325b2 |
|
|
|
f325b2 |
- gtk_widget_hide (pStatusBar);
|
|
|
f325b2 |
+ gtk_widget_hide(rWindow.m_pStatusBar);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
int main( int argc, char* argv[] )
|
|
|
f325b2 |
@@ -691,8 +696,8 @@ int main( int argc, char* argv[] )
|
|
|
f325b2 |
GtkWidget* pProgressBar = gtk_progress_bar_new ();
|
|
|
f325b2 |
g_signal_connect(pDocView, "load-changed", G_CALLBACK(loadChanged), pProgressBar);
|
|
|
f325b2 |
|
|
|
f325b2 |
- pStatusBar = gtk_statusbar_new ();
|
|
|
f325b2 |
- gtk_container_forall(GTK_CONTAINER(pStatusBar), removeChildrenFromStatusbar, NULL);
|
|
|
f325b2 |
+ GtkWidget* pStatusBar = gtk_statusbar_new ();
|
|
|
f325b2 |
+ gtk_container_forall(GTK_CONTAINER(pStatusBar), removeChildrenFromStatusbar, pStatusBar);
|
|
|
f325b2 |
gtk_container_add (GTK_CONTAINER(pVBox), pStatusBar);
|
|
|
f325b2 |
gtk_container_add (GTK_CONTAINER(pStatusBar), pProgressBar);
|
|
|
f325b2 |
gtk_widget_set_hexpand(pProgressBar, true);
|
|
|
f325b2 |
@@ -703,6 +708,7 @@ int main( int argc, char* argv[] )
|
|
|
f325b2 |
|
|
|
f325b2 |
TiledWindow aWindow;
|
|
|
f325b2 |
aWindow.m_pDocView = pDocView;
|
|
|
f325b2 |
+ aWindow.m_pStatusBar = pStatusBar;
|
|
|
f325b2 |
g_aWindows[pWindow] = aWindow;
|
|
|
f325b2 |
|
|
|
f325b2 |
lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2], NULL, openDocumentCallback, pDocView );
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|