[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/kexi-mobile-adam=5Fpigg=5D_kexi/mobile=3A_?=
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2011-04-03 20:06:23
Message-ID: 20110403200623.9219AA60B0 () git ! kde ! org
[Download RAW message or body]

Git commit 51b2d94468e598c3f9bee3b96ecef42177d47f06 by Adam Pigg.
Committed on 03/04/2011 at 18:16.
Pushed by piggz into branch 'kexi-mobile-adam_pigg'.

Restructured main window of KexiMobile to have a menu and bottom toolbar
like calligra-mobile

M  +16   -4    kexi/mobile/KexiMobileMainWindow.cpp     
M  +4    -1    kexi/mobile/KexiMobileMainWindow.h     
M  +0    -3    kexi/mobile/KexiMobileToolbar.cpp     
M  +0    -2    kexi/mobile/KexiMobileToolbar.h     

http://commits.kde.org/calligra/51b2d94468e598c3f9bee3b96ecef42177d47f06

diff --git a/kexi/mobile/KexiMobileMainWindow.cpp \
b/kexi/mobile/KexiMobileMainWindow.cpp index 4ba531e..643d61e 100644
--- a/kexi/mobile/KexiMobileMainWindow.cpp
+++ b/kexi/mobile/KexiMobileMainWindow.cpp
@@ -18,23 +18,35 @@
 #include <KexiWindow.h>
 #include <KexiView.h>
 #include <core/KexiRecordNavigatorHandler.h>
+#include <KToolBar>
 
 KexiMobileMainWindow::KexiMobileMainWindow()
 {
     m_mobile = new KexiMobileWidget(0);
     m_toolbar = new KexiMobileToolbar(this);
     m_layout = new QHBoxLayout(this);
-
-    m_layout->addWidget(m_toolbar);
+    
+    m_openFileAction = new QAction(KIcon("document-open"), "Open", this);
+    connect(m_openFileAction, SIGNAL(triggered(bool)), this, \
SLOT(slotOpenDatabase())); +    menuBar()->addAction(m_openFileAction);
+    
     m_layout->addWidget(m_mobile);
     m_layout->setSpacing(2);
     setFixedSize(800,480);
-
-    connect(m_toolbar, SIGNAL(pageOpenFile()), this, SLOT(slotOpenDatabase()));
+    
+    setCentralWidget(m_mobile);
+   
+    addToolBar(Qt::BottomToolBarArea, m_toolbar);
+    
     connect(m_toolbar, SIGNAL(pageNavigator()), m_mobile, SLOT(showNavigator()));
     connect(m_mobile->navigator(), SIGNAL(openItem(KexiPart::Item *)), this, \
SLOT(openObject(KexiPart::Item*)));  }
 
+void KexiMobileMainWindow::setupToolbar()
+{
+
+}
+
 KexiMobileMainWindow::~KexiMobileMainWindow()
 {}
 
diff --git a/kexi/mobile/KexiMobileMainWindow.h b/kexi/mobile/KexiMobileMainWindow.h
index 2ed6925..be8132f 100644
--- a/kexi/mobile/KexiMobileMainWindow.h
+++ b/kexi/mobile/KexiMobileMainWindow.h
@@ -8,7 +8,7 @@ class KexiMobileToolbar;
 class QHBoxLayout;
 class KexiMobileWidget;
 
-class KexiMobileMainWindow : public QWidget, public KexiMainWindowIface
+class KexiMobileMainWindow : public QMainWindow, public KexiMainWindowIface
 {
 Q_OBJECT
 public:
@@ -63,9 +63,12 @@ public slots:
 private:
     KexiMobileWidget *m_mobile;
     KexiMobileToolbar *m_toolbar;
+    QAction *m_openFileAction;
     KexiProject *m_project;
     QHBoxLayout *m_layout;
     
+    void setupToolbar();
+    
     KexiProject* openProject(const KUrl &url);
     bool openingAllowed(KexiPart::Item* item, Kexi::ViewMode viewMode, QString* \
errorMessage);  };
diff --git a/kexi/mobile/KexiMobileToolbar.cpp b/kexi/mobile/KexiMobileToolbar.cpp
index 9a4d21f..01f2f8a 100644
--- a/kexi/mobile/KexiMobileToolbar.cpp
+++ b/kexi/mobile/KexiMobileToolbar.cpp
@@ -32,7 +32,6 @@ KexiMobileToolbar::KexiMobileToolbar(QWidget* parent): \
QToolBar(parent),  {
     setOrientation(Qt::Vertical);
 
-    m_openFileAction = new QAction(KIcon("document-open"), "Open", this);
     m_gotoNavigatorAction = new \
QAction(KIcon("application-vnd.oasis.opendocument.database"), "Project", this);  
     
@@ -42,7 +41,6 @@ KexiMobileToolbar::KexiMobileToolbar(QWidget* parent): \
QToolBar(parent),  
     setIconSize(QSize(48,48));
     
-    addAction(m_openFileAction);
     addAction(m_gotoNavigatorAction);
     
     QWidget* spacer = new QWidget();
@@ -54,7 +52,6 @@ KexiMobileToolbar::KexiMobileToolbar(QWidget* parent): \
QToolBar(parent),  addAction(m_nextRecord);
 
     connect(m_gotoNavigatorAction, SIGNAL(triggered(bool)), this, \
                SLOT(gotoNavigatorClicked()));
-    connect(m_openFileAction, SIGNAL(triggered(bool)), this, \
SLOT(openFileClicked()));  
     connect(m_nextRecord, SIGNAL(triggered(bool)), this, SLOT(recordNext()));
     connect(m_previousRecord, SIGNAL(triggered(bool)), this, \
                SLOT(recordPrevious()));
diff --git a/kexi/mobile/KexiMobileToolbar.h b/kexi/mobile/KexiMobileToolbar.h
index 3e70576..5144a28 100644
--- a/kexi/mobile/KexiMobileToolbar.h
+++ b/kexi/mobile/KexiMobileToolbar.h
@@ -37,8 +37,6 @@ public:
     void setRecordHandler(KexiRecordNavigatorHandler *handler);
     
 private:
-
-    QAction *m_openFileAction;
     QAction *m_gotoNavigatorAction;
     
     QAction *m_previousRecord;


[prev in list] [next in list] [prev in thread] [next in thread]