By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1689
Collapse All | Expand All

(-)ori/tdebase/konqueror/konq_mainwindow.cc (-40 / +17 lines)
Lines 187-196 Link Here
187
  m_viewModeActions.setAutoDelete( true );
187
  m_viewModeActions.setAutoDelete( true );
188
  m_toolBarViewModeActions.setAutoDelete( true );
188
  m_toolBarViewModeActions.setAutoDelete( true );
189
  m_viewModeMenu = 0;
189
  m_viewModeMenu = 0;
190
  m_paCopyFiles = 0;
191
  m_paMoveFiles = 0;
192
  m_paDelete = 0;
190
  m_paDelete = 0;
193
  m_paNewDir = 0;
194
  m_bookmarkBarActionCollection = 0L;
191
  m_bookmarkBarActionCollection = 0L;
195
  KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this );
192
  KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this );
196
  m_pBookmarksOwner = extOwner;
193
  m_pBookmarksOwner = extOwner;
Lines 2254-2265 Link Here
2254
        act->setEnabled( false );
2251
        act->setEnabled( false );
2255
    }
2252
    }
2256
2253
2257
    if ( m_paCopyFiles )
2254
    m_paCopyFiles->setEnabled( false );
2258
      m_paCopyFiles->setEnabled( false );
2255
    m_paMoveFiles->setEnabled( false );
2259
    if ( m_paMoveFiles )
2256
    m_paNewDir->setEnabled( false );
2260
      m_paMoveFiles->setEnabled( false );
2261
    if ( m_paNewDir )
2262
      m_paNewDir->setEnabled( false );
2263
  }
2257
  }
2264
  createGUI( part );
2258
  createGUI( part );
2265
2259
Lines 3940-3946 Link Here
3940
  reloadShortcut.append(KKey(CTRL + Key_R));
3934
  reloadShortcut.append(KKey(CTRL + Key_R));
3941
  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
3935
  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
3942
  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
3936
  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
3943
  
3937
3944
  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
3938
  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
3945
3939
3946
  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
3940
  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
Lines 3964-3970 Link Here
3964
           TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
3958
           TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
3965
3959
3966
  m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
3960
  m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
3967
3961
  // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
3962
  m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
3963
  m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
3964
  // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff.
3965
  m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
3968
  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
3966
  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
3969
3967
3970
  // Location bar
3968
  // Location bar
Lines 4277-4317 Link Here
4277
    KonqDirPart * dirPart = static_cast<KonqDirPart *>(m_currentView->part());
4275
    KonqDirPart * dirPart = static_cast<KonqDirPart *>(m_currentView->part());
4278
    m_paFindFiles->setEnabled( dirPart->findPart() == 0 );
4276
    m_paFindFiles->setEnabled( dirPart->findPart() == 0 );
4279
4277
4280
    // Create the copy/move options if not already done
4278
    TQPtrList<TDEAction> lst;
4281
    if ( !m_paCopyFiles )
4279
    if (!m_paCopyFiles->isPlugged())
4282
    {
4283
      // F5 is the default key binding for Reload.... a la Windows.
4284
      // mc users want F5 for Copy and F6 for move, but I can't make that default.
4285
      m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
4286
      m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
4287
4288
      // This action doesn't appear in the GUI, it's for the shortcut only.
4289
      // KNewMenu takes care of the GUI stuff.
4290
      m_paNewDir = new TDEAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ),
4291
                                actionCollection(), "konq_create_dir" );
4292
4293
      TQPtrList<TDEAction> lst;
4294
      lst.append( m_paCopyFiles );
4280
      lst.append( m_paCopyFiles );
4281
    if (!m_paMoveFiles->isPlugged())
4295
      lst.append( m_paMoveFiles );
4282
      lst.append( m_paMoveFiles );
4296
      m_paCopyFiles->setEnabled( false );
4283
    m_paCopyFiles->setEnabled( false );
4297
      m_paMoveFiles->setEnabled( false );
4284
    m_paMoveFiles->setEnabled( false );
4285
    if (!lst.isEmpty())
4298
      plugActionList( "operations", lst );
4286
      plugActionList( "operations", lst );
4299
    }
4300
  }
4287
  }
4301
  else
4288
  else
4302
  {
4289
  {
4303
      m_paFindFiles->setEnabled( false );
4290
    m_paFindFiles->setEnabled( false );
4304
4291
    unplugActionList( "operations" );
4305
      if (m_paCopyFiles)
4306
      {
4307
          unplugActionList( "operations" );
4308
          delete m_paCopyFiles;
4309
          m_paCopyFiles = 0;
4310
          delete m_paMoveFiles;
4311
          m_paMoveFiles = 0;
4312
          delete m_paNewDir;
4313
          m_paNewDir = 0;
4314
      }
4315
  }
4292
  }
4316
}
4293
}
4317
4294

Return to bug 1689