← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ktorrent/trusty

« back to all changes in this revision

Viewing changes to ktorrent/gui.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-08-16 05:21:14 UTC
  • mfrom: (1.1.29 upstream) (0.6.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090816052114-8qosmkhvmbl2o19m
Tags: 3.2.3.1+dfsg.1-1ubuntu1
https://launchpad.net/bugs/414520
* Merge from debian unstable, remaining changes: (LP: #414520)
  - Build-depend directly on libboost-serialization1.38-dev since
    libboost-serialization-dev from boost-defaults is not in Main
  - Add KUBUNTU_DESKTOP_POT to rules
  - Drop libphonon-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
ktorrent/gui.cpp
128
128
                notifyViewListeners(view_man->getCurrentTorrent());
129
129
                //markk.update();
130
130
                updateActions();
 
131
                core->startUpdateTimer();
131
132
        }
132
133
 
133
134
        GUI:: ~GUI()
538
539
                
539
540
                show_kt_action = new KAction(KIcon("kt-show-hide"),i18n("Show/Hide KTorrent"),this);
540
541
                connect(show_kt_action,SIGNAL(triggered()),this,SLOT(showOrHide()));
541
 
                show_kt_action->setGlobalShortcut(KShortcut(Qt::ALT+ Qt::CTRL + Qt::Key_T), 
542
 
                                                                                  KAction::ActiveShortcut | KAction::DefaultShortcut,KAction::Autoloading);
543
 
                show_kt_action->setShortcut(show_kt_action->globalShortcut());
544
542
                ac->addAction("show_kt",show_kt_action);
 
543
                show_kt_action->setGlobalShortcut(KShortcut(Qt::ALT+ Qt::SHIFT + Qt::Key_T), 
 
544
                                                KAction::ActiveShortcut | KAction::DefaultShortcut,KAction::Autoloading);
545
545
 
546
546
                setStandardToolBarMenuEnabled(true);
547
547