diff options
| -rw-r--r-- | kpdf/shell/main.cpp | 15 | ||||
| -rw-r--r-- | kpdf/shell/shell.cpp | 533 | ||||
| -rw-r--r-- | kpdf/shell/shell.h | 69 | ||||
| -rw-r--r-- | kpdf/shell/shell.rc | 14 |
4 files changed, 509 insertions, 122 deletions
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 9b8d0a18..dfe6078c 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -60,19 +60,12 @@ int main(int argc, char** argv) // no session.. just start up normally TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); - if (args->count() == 0) + KPDF::Shell* widget = new KPDF::Shell; + for (int i = 0; i < args->count(); ++i) { - KPDF::Shell* widget = new KPDF::Shell; - widget->show(); - } - else - { - for (int i = 0; i < args->count(); ++i) - { - KPDF::Shell* widget = new KPDF::Shell(args->url(i)); - widget->show(); - } + widget->openURL(args->url(i)); } + widget->show(); args->clear(); } diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 463f8a12..a44e596c 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -20,18 +20,23 @@ // qt/kde includes #include <tqcursor.h> #include <tqtimer.h> +#include <tqtoolbutton.h> +#include <ktabwidget.h> +#include <tqptrlist.h> #include <tdeaction.h> #include <tdeapplication.h> #include <kedittoolbar.h> #include <tdefiledialog.h> #include <klibloader.h> #include <tdemessagebox.h> +#include <kiconloader.h> #include <kstdaction.h> #include <kurl.h> #include <kdebug.h> #include <tdelocale.h> #include <tdemenubar.h> #include <tdeparts/componentfactory.h> +#include <tdeparts/partmanager.h> #include <tdeio/netaccess.h> #include <tdemainwindowiface.h> @@ -41,13 +46,25 @@ using namespace KPDF; Shell::Shell() - : KParts::MainWindow(0, "KPDF::Shell"), m_menuBarWasShown(true), m_toolBarWasShown(true) + : KParts::MainWindow(0, "KPDF::Shell"), + m_menuBarWasShown(true), + m_toolBarWasShown(true), + m_tabs(nullptr), + m_tabsContextMenu(nullptr), + m_manager(nullptr), + m_workingTab(-1) { init(); } Shell::Shell(const KURL &url) - : KParts::MainWindow(0, "KPDF::Shell"), m_menuBarWasShown(true), m_toolBarWasShown(true) + : KParts::MainWindow(0, "KPDF::Shell"), + m_menuBarWasShown(true), + m_toolBarWasShown(true), + m_tabs(nullptr), + m_tabsContextMenu(nullptr), + m_manager(nullptr), + m_workingTab(-1) { m_openUrl = url; init(); @@ -55,42 +72,38 @@ Shell::Shell(const KURL &url) void Shell::init() { - // set the shell's ui resource file - setXMLFile("shell.rc"); - // this routine will find and load our Part. it finds the Part by // name which is a bad idea usually.. but it's alright in this // case since our Part is made for this Shell - KParts::Factory *factory = (KParts::Factory *) KLibLoader::self()->factory("libkpdfpart"); - if (factory) - { - // now that the Part is loaded, we cast it to a Part to get - // our hands on it - m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", this, 0, "KParts::ReadOnlyPart"); - if (m_part) - { - // then, setup our actions - setupActions(); - // tell the KParts::MainWindow that this is indeed the main widget - setCentralWidget(m_part->widget()); - // and integrate the part's GUI with the shell's - setupGUI(Keys | Save); - createGUI(m_part); - m_showToolBarAction = static_cast<TDEToggleAction*>(toolBarMenuAction()); - } - } - else + m_factory = (KParts::Factory *) KLibLoader::self()->factory("libkpdfpart"); + if (!m_factory) { // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Unable to find kpdf part.")); - m_part = 0; + TQTimer::singleShot(0, tdeApp, TQ_SLOT(quit())); return; } - connect( this, TQ_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQ_SLOT( restoreDocument(TDEConfig*))); - connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*))); - connect( m_part, TQ_SIGNAL( enablePrintAction(bool) ), m_printAction, TQ_SLOT( setEnabled(bool))); - + + m_tabs = new KTabWidget(this); + connect(m_tabs, TQ_SIGNAL(contextMenu(const TQPoint &)), + this, TQ_SLOT(slotTabContextMenu(const TQPoint &))); + connect(m_tabs, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + + m_manager = new KParts::PartManager(this, "kpdf part manager"); + connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*))); + connect(m_manager, TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotChangeTab(KParts::Part*))); + + setCentralWidget(m_tabs); + setXMLFile("shell.rc"); + + setupActions(); + setupGUI(Keys | Save); + m_showToolBarAction = static_cast<TDEToggleAction*>(toolBarMenuAction()); + readSettings(); if (!TDEGlobal::config()->hasGroup("MainWindow")) { @@ -98,67 +111,128 @@ void Shell::init() kmwi.maximize(); } setAutoSaveSettings(); - - if (m_openUrl.isValid()) TQTimer::singleShot(0, this, TQ_SLOT(delayedOpen())); + + slotAddTab(); + if (m_openUrl.isValid()) + { + TQTimer::singleShot(0, this, TQ_SLOT(delayedOpen())); + } } void Shell::delayedOpen() { - openURL(m_openUrl); + openURL(m_openUrl); } Shell::~Shell() { - if(m_part) writeSettings(); + if (m_tabs) + { + writeSettings(); + } } void Shell::openURL( const KURL & url ) { - if ( m_part ) + // if the current part has no url, reuse part + KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart*>(m_manager->activePart()); + if (!part || !part->url().isEmpty()) + { + part = createTab(); + } + + if (part) + { + if (url.isValid()) { - bool openOk = m_part->openURL( url ); - if ( openOk ) - m_recent->addURL( url ); - else - m_recent->removeURL( url ); + m_tabs->changeTab(part->widget(), url.filename()); + bool openOk = part->openURL(url); + if (openOk) + { + m_recent->addURL(url); + } + else + { + m_recent->removeURL(url); + } } + } } - void Shell::readSettings() { - m_recent->loadEntries( TDEGlobal::config() ); - m_recent->setEnabled( true ); // force enabling - m_recent->setToolTip( i18n("Click to open a file\nClick and hold to open a recent file") ); + m_recent->loadEntries( TDEGlobal::config() ); + m_recent->setEnabled( true ); // force enabling + m_recent->setToolTip( i18n("Click to open a file\nClick and hold to open a recent file") ); - TDEGlobal::config()->setDesktopGroup(); - bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false ); - setFullScreen( fullScreen ); + TDEGlobal::config()->setDesktopGroup(); + bool fullScreen = TDEGlobal::config()->readBoolEntry( "FullScreen", false ); + setFullScreen( fullScreen ); } void Shell::writeSettings() { - m_recent->saveEntries( TDEGlobal::config() ); - TDEGlobal::config()->setDesktopGroup(); - TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked()); - TDEGlobal::config()->sync(); + m_recent->saveEntries( TDEGlobal::config() ); + TDEGlobal::config()->setDesktopGroup(); + TDEGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked()); + TDEGlobal::config()->sync(); } void Shell::setupActions() { - TDEAction * openAction = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - m_recent = KStdAction::openRecent( this, TQ_SLOT( openURL( const KURL& ) ), actionCollection() ); - connect( m_recent, TQ_SIGNAL( activated() ), openAction, TQ_SLOT( activate() ) ); - m_recent->setWhatsThis( i18n( "<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file" ) ); - m_printAction = KStdAction::print( m_part, TQ_SLOT( slotPrint() ), actionCollection() ); - m_printAction->setEnabled( false ); + TDEAction *openAction = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + m_recent = KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL&)), actionCollection()); + connect(m_recent, TQ_SIGNAL(activated()), openAction, TQ_SLOT( activate())); + m_recent->setWhatsThis(i18n("<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file")); + m_printAction = KStdAction::print(m_manager->activePart(), TQ_SLOT(slotPrint()), actionCollection()); + m_printAction->setEnabled(false); KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - m_showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection()); + m_showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenubar()), actionCollection()); KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); + m_fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotUpdateFullScreen()), actionCollection(), this); + + TDEAction *addTab = new TDEAction(i18n("&New Tab"), SmallIcon("tab_new"), "Ctrl+Shift+N;Ctrl+T", + this, TQ_SLOT(slotAddTab()), actionCollection(), + "newtab"); + + m_addTabButton = new TQToolButton(m_tabs); + m_addTabButton->setIconSet(SmallIconSet("tab_new")); + m_tabs->setCornerWidget(m_addTabButton, TQt::TopLeft); + connect(m_addTabButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddTab())); + m_addTabButton->show(); + + TDEAction *removeTab = new TDEAction(i18n("&Close Tab"), SmallIcon("tab_remove"), "Ctrl+W", + this, TQ_SLOT(slotRemoveTab()), actionCollection(), + "removecurrenttab"); + + m_removeTabButton = new TQToolButton(m_tabs); + m_removeTabButton->setIconSet(SmallIconSet("tab_remove")); + m_tabs->setCornerWidget(m_removeTabButton, TQt::TopRight); + connect(m_removeTabButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveTab())); + m_removeTabButton->show(); + + TDEAction *duplicateTab = new TDEAction(i18n("&Duplicate Tab"), SmallIcon("tab_duplicate"), "Ctrl+Shift+D", + this, TQ_SLOT(slotDuplicateTab()), actionCollection(), + "duplicatecurrenttab"); + + TDEAction *breakOffTab = new TDEAction(i18n("D&etach Tab"), SmallIcon("tab_breakoff"), TQString::null, + this, TQ_SLOT(slotBreakOffTab()), actionCollection(), + "breakoffcurrenttab"); + + TDEAction *moveTabLeft = new TDEAction(i18n("Move Tab &Left"), SmallIcon("tab_move_left"), "Ctrl+Shift+Left", + this, TQ_SLOT(slotMoveTabLeft()), actionCollection(), + "tab_move_left"); + + TDEAction *moveTabRight = new TDEAction(i18n("Move Tab &Right"), SmallIcon("tab_move_right"), "Ctrl+Shift+Right", + this, TQ_SLOT(slotMoveTabRight()), actionCollection(), + "tab_move_right"); + + TDEAction *removeOtherTabs = new TDEAction(i18n("Close &Other Tabs"), SmallIcon("tab_remove_other"), "Ctrl+Alt+W", + this, TQ_SLOT(slotRemoveOtherTabs()), actionCollection(), + "removeothertabs"); } void Shell::saveProperties(TDEConfig* config) @@ -166,7 +240,7 @@ void Shell::saveProperties(TDEConfig* config) // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored - emit saveDocumentRestoreInfo(config); + emit saveDocumentRestoreInfo(config); } void Shell::readProperties(TDEConfig* config) @@ -175,14 +249,13 @@ void Shell::readProperties(TDEConfig* config) // config file. this function is automatically called whenever // the app is being restored. read in here whatever you wrote // in 'saveProperties' - if(m_part) + if (m_manager->parts()->count() > 0) { emit restoreDocument(config); } } - void -Shell::fileOpen() +void Shell::fileOpen() { // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar @@ -190,19 +263,19 @@ Shell::fileOpen() KURL url = KFileDialog::getOpenURL( TQString(), "application/pdf application/postscript" );//getOpenFileName(); if (!url.isEmpty()) + { openURL(url); + } } - void -Shell::optionsConfigureToolbars() +void Shell::optionsConfigureToolbars() { KEditToolbar dlg(factory()); connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } - void -Shell::applyNewToolbarConfig() +void Shell::applyNewToolbarConfig() { applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } @@ -223,40 +296,316 @@ void Shell::setFullScreen( bool useFullScreen ) void Shell::slotUpdateFullScreen() { - if(m_fullScreenAction->isChecked()) + if(m_fullScreenAction->isChecked()) + { + m_menuBarWasShown = m_showMenuBarAction->isChecked(); + m_showMenuBarAction->setChecked(false); + menuBar()->hide(); + + m_toolBarWasShown = m_showToolBarAction->isChecked(); + m_showToolBarAction->setChecked(false); + toolBar()->hide(); + + showFullScreen(); + } + else + { + if (m_menuBarWasShown) { - m_menuBarWasShown = m_showMenuBarAction->isChecked(); - m_showMenuBarAction->setChecked(false); - menuBar()->hide(); - - m_toolBarWasShown = m_showToolBarAction->isChecked(); - m_showToolBarAction->setChecked(false); - toolBar()->hide(); - - showFullScreen(); + m_showMenuBarAction->setChecked(true); + menuBar()->show(); } - else + if (m_toolBarWasShown) { - if (m_menuBarWasShown) - { - m_showMenuBarAction->setChecked(true); - menuBar()->show(); - } - if (m_toolBarWasShown) - { - m_showToolBarAction->setChecked(true); - toolBar()->show(); - } - showNormal(); + m_showToolBarAction->setChecked(true); + toolBar()->show(); } + showNormal(); + } } void Shell::slotShowMenubar() { - if ( m_showMenuBarAction->isChecked() ) - menuBar()->show(); - else - menuBar()->hide(); + if ( m_showMenuBarAction->isChecked() ) + menuBar()->show(); + else + menuBar()->hide(); +} + +KParts::ReadOnlyPart* Shell::createTab() +{ + KParts::ReadOnlyPart *part = + (KParts::ReadOnlyPart*)m_factory->createPart(m_tabs, "kpdf_part", + m_tabs, nullptr, + "KParts::ReadOnlyPart"); + m_tabs->addTab(part->widget(), i18n("No file")); + + connect(this, TQ_SIGNAL(restoreDocument(TDEConfig*)), + part, TQ_SLOT(restoreDocument(TDEConfig*))); + connect(this, TQ_SIGNAL(saveDocumentRestoreInfo(TDEConfig*)), + part, TQ_SLOT(saveDocumentRestoreInfo(TDEConfig*))); + connect(part, TQ_SIGNAL(enablePrintAction(bool)), + m_printAction, TQ_SLOT(setEnabled(bool))); + + part->widget()->show(); + m_manager->addPart(part, true); + return part; +} + +void Shell::slotAddTab() +{ + createTab(); +} + +void Shell::slotRemoveTab() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + KParts::ReadOnlyPart *part = findPartForTab(m_workingTab); + if (part) + { + m_tabs->removePage(part->widget()); + part->deleteLater(); + } + + m_workingTab = -1; +} + +void Shell::slotChangeTab(KParts::Part *part) +{ + if (!part) + { + part = createTab(); + } + + m_tabs->showPage(part->widget()); +} + +void Shell::initTabContextMenu() +{ + if (m_tabsContextMenu) return; + + m_tabsContextMenu = new TQPopupMenu(this); + m_tabsContextMenu->insertItem(SmallIcon("tab_new"), + i18n("&New Tab"), + this, TQ_SLOT(slotAddTab()), + action("newtab")->shortcut()); + m_tabsContextMenu->insertItem(SmallIconSet("tab_duplicate"), + i18n("&Duplicate Tab"), + this, TQ_SLOT(slotDuplicateTab()), + action("duplicatecurrenttab")->shortcut(), + TabContextMenuItem::TabDuplicate); + m_tabsContextMenu->insertItem(SmallIconSet("tab_breakoff"), + i18n("D&etach Tab"), + this, TQ_SLOT(slotBreakOffTab()), + action("breakoffcurrenttab")->shortcut(), + TabContextMenuItem::TabBreakOff); + m_tabsContextMenu->insertSeparator(); + m_tabsContextMenu->insertItem(SmallIconSet("1leftarrow"), + i18n("Move Tab &Left"), + this, TQ_SLOT(slotMoveTabLeft()), + action("tab_move_left")->shortcut(), + TabContextMenuItem::TabMoveLeft); + m_tabsContextMenu->insertItem(SmallIconSet("1rightarrow"), + i18n("Move Tab &Right"), + this, TQ_SLOT(slotMoveTabRight()), + action("tab_move_right")->shortcut(), + TabContextMenuItem::TabMoveRight); + m_tabsContextMenu->insertSeparator(); + m_tabsContextMenu->insertItem(SmallIconSet("tab_remove"), + i18n("&Close Tab"), + this, TQ_SLOT(slotRemoveTab()), + action("removecurrenttab")->shortcut(), + TabContextMenuItem::TabRemove); + m_tabsContextMenu->insertItem(SmallIconSet("tab_remove_other"), + i18n("Close &Other Tabs"), + this, TQ_SLOT(slotRemoveOtherTabs()), + action("removeothertabs")->shortcut(), + TabContextMenuItem::TabRemoveOther); +} + +void Shell::slotTabContextMenu(const TQPoint &pos) +{ + if (!m_tabsContextMenu) + { + initTabContextMenu(); + } + + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabDuplicate, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabBreakOff, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveLeft, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveRight, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabRemove, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabRemoveOther, false); + + + m_tabsContextMenu->popup(pos); +} +void Shell::slotTabContextMenu(TQWidget *w, const TQPoint &pos) +{ + if (!m_tabsContextMenu) + { + initTabContextMenu(); + } + + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabDuplicate, true); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabBreakOff, m_tabs->count() > 1); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabRemove, true); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabRemoveOther, true); + + int idx = m_tabs->indexOf(w); + if (idx > -1) + { + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveLeft, idx > 0); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveRight, idx + 1 < m_tabs->count()); + } + else + { + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveLeft, false); + m_tabsContextMenu->setItemEnabled(TabContextMenuItem::TabMoveRight, false); + } + + m_workingTab = m_tabs->indexOf(w); + m_tabsContextMenu->popup(pos); +} + +KParts::ReadOnlyPart* Shell::findPartForTab(int tabIndex) +{ + if (tabIndex == -1) return nullptr; + + TQWidget *page = m_tabs->page(tabIndex); + if (!page) return nullptr; + + TQPtrList<KParts::Part> *parts = const_cast<TQPtrList<KParts::Part>*>(m_manager->parts()); + KParts::Part *part; + for (part = parts->first(); part; part = parts->next()) + { + if (part->widget() == page) + { + return static_cast<KParts::ReadOnlyPart*>(part); + } + } + return nullptr; +} + +void Shell::moveTabForward(int tabIndex) +{ + if (tabIndex < m_tabs->count() - 1) + { + m_tabs->moveTab(tabIndex, tabIndex + 1); + } +} + +void Shell::moveTabBackward(int tabIndex) +{ + if (tabIndex > 0) + { + m_tabs->moveTab(tabIndex, tabIndex - 1); + } +} + +void Shell::slotDuplicateTab() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + KParts::ReadOnlyPart *currentTab = findPartForTab(m_workingTab); + if (currentTab) + { + openURL(currentTab->url()); + } + + m_workingTab = -1; +} + +void Shell::slotBreakOffTab() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + KParts::ReadOnlyPart *currentTab = findPartForTab(m_workingTab); + if (currentTab) + { + KPDF::Shell* widget = new KPDF::Shell(currentTab->url()); + widget->show(); + } + slotRemoveTab(); + m_workingTab = -1; +} + +void Shell::slotMoveTabLeft() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + if (TQApplication::reverseLayout()) + { + moveTabForward(m_workingTab); + } + else + { + moveTabBackward(m_workingTab); + } + + m_workingTab = -1; +} + +void Shell::slotMoveTabRight() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + if (TQApplication::reverseLayout()) + { + moveTabBackward(m_workingTab); + } + else + { + moveTabForward(m_workingTab); + } + + m_workingTab = -1; +} + +void Shell::slotRemoveOtherTabs() +{ + if (m_workingTab == -1) + { + m_workingTab = m_tabs->currentPageIndex(); + } + + if (KMessageBox::warningContinueCancel(this, + i18n("Do you really want to close all other tabs?"), + i18n("Close Other Tabs Confirmation"), + KGuiItem(i18n("Close &Other Tabs"), "tab_remove_other"), + "CloseOtherTabConfirm") != KMessageBox::Continue) + { + m_workingTab = -1; + return; + } + + KParts::ReadOnlyPart *currentPart = findPartForTab(m_workingTab); + if (!currentPart) return; + + TQPtrList<KParts::Part> *parts = const_cast<TQPtrList<KParts::Part>*>(m_manager->parts()); + KParts::Part *part; + for (part = parts->first(); part; part = parts->next()) + { + if (part == currentPart) continue; + m_tabs->removePage(part->widget()); + part->deleteLater(); + } } #include "shell.moc" diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h index 0784516f..28be65e3 100644 --- a/kpdf/shell/shell.h +++ b/kpdf/shell/shell.h @@ -22,6 +22,16 @@ #include <tdeparts/mainwindow.h> +class TQToolButton; +class TQPopupMenu; +class KTabWidget; + +namespace KParts +{ + class Factory; + class PartManager; +} + namespace KPDF { class Part; @@ -36,7 +46,7 @@ namespace KPDF class Shell : public KParts::MainWindow { TQ_OBJECT - + public: /** @@ -54,6 +64,16 @@ namespace KPDF */ virtual ~Shell(); + enum TabContextMenuItem + { + TabDuplicate = 100, + TabBreakOff, + TabMoveLeft, + TabMoveRight, + TabRemove, + TabRemoveOther + }; + protected: /** * This method is called when it is time for the app to save its @@ -72,6 +92,9 @@ namespace KPDF void setFullScreen( bool ); public slots: + void openURL(const KURL & url); + void slotAddTab(); + void slotRemoveTab(); void slotQuit(); private slots: @@ -81,29 +104,45 @@ namespace KPDF void applyNewToolbarConfig(); void slotUpdateFullScreen(); void slotShowMenubar(); - - void openURL( const KURL & url ); void delayedOpen(); + void slotChangeTab(KParts::Part *part); + void slotTabContextMenu(const TQPoint &pos); + void slotTabContextMenu(TQWidget *w, const TQPoint &pos); + + void slotDuplicateTab(); + void slotBreakOffTab(); + void slotMoveTabLeft(); + void slotMoveTabRight(); + void slotRemoveOtherTabs(); + signals: - void restoreDocument(TDEConfig* config); - void saveDocumentRestoreInfo(TDEConfig* config); - - + void restoreDocument(TDEConfig* config); + void saveDocumentRestoreInfo(TDEConfig* config); + + private: void setupAccel(); void setupActions(); void init(); + void initTabContextMenu(); + KParts::ReadOnlyPart *createTab(); + KParts::ReadOnlyPart *findPartForTab(int tabIndex); + void moveTabForward(int tabIndex); + void moveTabBackward(int tabIndex); private: - KParts::ReadOnlyPart* m_part; - TDERecentFilesAction* m_recent; - TDEAction* m_printAction; - TDEToggleAction* m_fullScreenAction; - TDEToggleAction* m_showMenuBarAction; - TDEToggleAction* m_showToolBarAction; - bool m_menuBarWasShown, m_toolBarWasShown; - KURL m_openUrl; + KTabWidget *m_tabs; + KParts::Factory *m_factory; + KParts::PartManager *m_manager; + TDERecentFilesAction* m_recent; + TDEAction *m_printAction, *m_addTabAction, *m_closeTabAction; + TDEToggleAction *m_fullScreenAction, *m_showMenuBarAction, *m_showToolBarAction; + TQToolButton *m_addTabButton, *m_removeTabButton; + TQPopupMenu *m_tabsContextMenu; + bool m_menuBarWasShown, m_toolBarWasShown; + KURL m_openUrl; // delayed open + int m_workingTab; }; } diff --git a/kpdf/shell/shell.rc b/kpdf/shell/shell.rc index 134d34c7..f97cbe0c 100644 --- a/kpdf/shell/shell.rc +++ b/kpdf/shell/shell.rc @@ -1,13 +1,19 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui version="7" name="kpdf_shell" > +<kpartgui version="8" name="kpdf_shell" > <MenuBar> <Menu name="file" > <DefineGroup append="save_merge" name="file_save" /> <DefineGroup append="print_merge" name="file_print" /> </Menu> - <!--Menu name="view" > - <Action name="fullscreen" /> - </Menu--> + <Menu name="view" > + <Action name="newtab" /> + <Action name="duplicatecurrenttab" /> + <Action name="breakoffcurrenttab" /> + <Separator /> + <Action name="removecurrenttab" /> + <Action name="removeothertabs" /> + <Separator /> + </Menu> <Menu name="settings" > <DefineGroup append="show_merge" name="show_merge" /> </Menu> |