← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to braindump/src/View.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
braindump/src/View.cpp
49
49
#include "import/DockerManager.h"
50
50
#include "KoToolBoxFactory.h"
51
51
 
 
52
#include <KoIcon.h>
 
53
 
52
54
#include <kdebug.h>
53
55
#include <klocale.h>
54
 
#include <kicon.h>
55
56
#include <ktoggleaction.h>
56
57
#include <kactionmenu.h>
57
58
#include <kactioncollection.h>
183
184
    actionCollection()->addAction(KStandardAction::SelectAll,  "edit_select_all", this, SLOT(editSelectAll()));
184
185
    actionCollection()->addAction(KStandardAction::Deselect,  "edit_deselect_all", this, SLOT(editDeselectAll()));
185
186
 
186
 
    m_deleteSelectionAction = new KAction(KIcon("edit-delete"), i18n("D&elete"), this);
 
187
    m_deleteSelectionAction = new KAction(koIcon("edit-delete"), i18n("D&elete"), this);
187
188
    actionCollection()->addAction("edit_delete", m_deleteSelectionAction);
188
189
    m_deleteSelectionAction->setShortcut(QKeySequence("Del"));
189
190
    connect(m_deleteSelectionAction, SIGNAL(triggered()), this, SLOT(editDeleteSelection()));
195
196
    actionDuplicate->setShortcut(QKeySequence("Ctrl+D"));
196
197
    connect(actionDuplicate, SIGNAL(triggered()), this, SLOT(selectionDuplicate()));
197
198
 
198
 
    m_groupShapes = new KAction(KIcon("object-group"), i18n("Group Shapes"), this);
 
199
    m_groupShapes = new KAction(koIcon("object-group"), i18n("Group Shapes"), this);
199
200
    actionCollection()->addAction("shapes_group", m_groupShapes);
200
201
    m_groupShapes->setShortcut(QKeySequence("Ctrl+G"));
201
202
    connect(m_groupShapes, SIGNAL(triggered()), this, SLOT(groupSelection()));
202
203
 
203
 
    m_ungroupShapes  = new KAction(KIcon("object-ungroup"), i18n("Ungroup Shapes"), this);
 
204
    m_ungroupShapes  = new KAction(koIcon("object-ungroup"), i18n("Ungroup Shapes"), this);
204
205
    actionCollection()->addAction("shapes_ungroup", m_ungroupShapes);
205
206
    m_ungroupShapes->setShortcut(QKeySequence("Ctrl+Shift+G"));
206
207
    connect(m_ungroupShapes, SIGNAL(triggered()), this, SLOT(ungroupSelection()));