-rw-r--r-- | core/launcher/launcher.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 5ec1cf8..ccc2114 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -78,5 +78,5 @@ static bool isVisibleWindow( int ); | |||
78 | 78 | ||
79 | LauncherTabWidget::LauncherTabWidget( Launcher* parent ) : | 79 | LauncherTabWidget::LauncherTabWidget( Launcher* parent ) : |
80 | QVBox( parent ), docview( 0 ) | 80 | QVBox( parent ), docview( 0 ),docTabEnabled(true),m_DocumentTabId(0) |
81 | { | 81 | { |
82 | docLoadingWidgetEnabled = false; | 82 | docLoadingWidgetEnabled = false; |
@@ -129,5 +129,5 @@ void LauncherTabWidget::createDocLoadingWidget() | |||
129 | Config cfg( "Launcher" ); | 129 | Config cfg( "Launcher" ); |
130 | cfg.setGroup( "DocTab" ); | 130 | cfg.setGroup( "DocTab" ); |
131 | bool docTabEnabled = cfg.readBoolEntry( "Enable", true ); | 131 | docTabEnabled = cfg.readBoolEntry( "Enable", true ); |
132 | 132 | ||
133 | QLabel *textLabel = new QLabel( docLoadingVBox ); | 133 | QLabel *textLabel = new QLabel( docLoadingVBox ); |
@@ -217,12 +217,15 @@ LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm, | |||
217 | this, SIGNAL(rightPressed(AppLnk*))); | 217 | this, SIGNAL(rightPressed(AppLnk*))); |
218 | 218 | ||
219 | |||
219 | int n = categoryBar->count(); | 220 | int n = categoryBar->count(); |
221 | |||
220 | stack->addWidget( view, n ); | 222 | stack->addWidget( view, n ); |
221 | 223 | ||
222 | LauncherTab *tab = new LauncherTab( id, view, pm, label ); | 224 | LauncherTab *tab = new LauncherTab( id, view, pm, label ); |
223 | categoryBar->insertTab( tab, n-1 ); | 225 | categoryBar->insertTab( tab, n-1 ); |
224 | 226 | if ( id == "Documents" ) { | |
225 | if ( id == "Documents" ) | ||
226 | docview = view; | 227 | docview = view; |
228 | m_DocumentTabId = n; | ||
229 | } | ||
227 | 230 | ||
228 | odebug << "inserting " << id << " at " << n-1 << "" << oendl; | 231 | odebug << "inserting " << id << " at " << n-1 << "" << oendl; |
@@ -605,5 +608,4 @@ void Launcher::properties( AppLnk *appLnk ) | |||
605 | 608 | ||
606 | if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) { | 609 | if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) { |
607 | tabs->docView()->updateTools(); | ||
608 | } | 610 | } |
609 | } | 611 | } |
@@ -722,6 +724,11 @@ void Launcher::documentRemoved( const DocLnk& doc ) | |||
722 | void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc ) | 724 | void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc ) |
723 | { | 725 | { |
726 | #if 0 | ||
724 | documentRemoved( oldDoc ); | 727 | documentRemoved( oldDoc ); |
725 | documentAdded( newDoc ); | 728 | documentAdded( newDoc ); |
729 | // tabs->docView()->updateTools(); | ||
730 | #else | ||
731 | tabs->docView()->changeItem(oldDoc,new DocLnk(newDoc)); | ||
732 | #endif | ||
726 | } | 733 | } |
727 | 734 | ||