← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty

« back to all changes in this revision

Viewing changes to src/modules/actioneditor/ActionEditor.cpp

  • Committer: Package Import Robot
  • Author(s): Kai Wasserbäch
  • Date: 2011-09-29 16:27:07 UTC
  • mfrom: (0.3.15 upstream)
  • Revision ID: package-import@ubuntu.com-20110929162707-t29s6itjnsg2syuf
Tags: 4:4.1.3+20110929.svn5980-1
The "Balance of Power" release.

* Synced to upstream's SVN revision 5980.
* debian/control:
  - Vcs-* fields updated.
  - Remove libcrypto++-dev from B-Ds, was dropped upstream.
  - Bumped B-D on debhelper to >= 8.9.4.
* debian/rules:
  - Remove a now obsolete flag.
  - Upstream fixed a typo in a configuration variable name (now
    WANT_COEXISTENCE), updated invocation.
* debian/compat: Now at 9.
* Make KVIrc multiarch ready:
  - debian/{kvirc,libkvilib4,kvirc-modules}.install: Split out binaries
    under /usr/lib.
  - debian/rules: Add -DLIB_SUFFIX to dh_auto_configure invocation.
  - debian/control:
    + Added new packages (needed for split).
    + Added Multi-Arch fields
    + Added Pre-Depends: multiarch-support and ${misc:Pre-Depends} where
      needed.
    + Bumped B-D on CMake.
  - debian/{kvirc,libkvilib4,kvirc-modules}.lintian-overrides: Moved and
    updated overrides to match new locations (one could be dropped in the
    process).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/actioneditor/ActionEditor.cpp
114
114
 
115
115
        QTabWidget * tw = new QTabWidget(this);
116
116
        g->addWidget(tw,2,0,1,2);
117
 
//      g->addMultiCellWidget(tw,2,2,0,1);
118
117
 
119
118
        // code tab
120
119
        QWidget * tab = new QWidget(tw);
134
133
        gl->addWidget(l,0,0);
135
134
        m_pCategoryCombo = new QComboBox(tab);
136
135
        gl->addWidget(m_pCategoryCombo,0,1,1,3);
137
 
        //gl->addMultiCellWidget(m_pCategoryCombo,0,0,1,3);
138
136
        m_pCategoryCombo->setToolTip(__tr2qs_ctx("Choose the category that best fits for this action","editor"));
139
137
 
140
138
        l = new QLabel(__tr2qs_ctx("Description:","editor"),tab);
141
139
        gl->addWidget(l,1,0);
142
140
        m_pDescriptionEdit = new QLineEdit(tab);
143
141
        gl->addWidget(m_pDescriptionEdit,1,1,1,3);
144
 
//      gl->addMultiCellWidget(m_pDescriptionEdit,1,1,1,3);
145
142
        m_pDescriptionEdit->setToolTip(__tr2qs_ctx("Visible short description for this action.<br>This string will be displayed to the user so it is a good idea to use $tr() here","editor"));
146
143
 
147
144
        l = new QLabel(__tr2qs_ctx("Small Icon:","editor"),tab);
167
164
        m_pBigIconButton->setIconSize(QSize(32,32));
168
165
        connect(m_pBigIconButton,SIGNAL(clicked()),this,SLOT(chooseBigIcon()));
169
166
        gl->addWidget(m_pBigIconButton,3,2,2,2);
170
 
//      gl->addMultiCellWidget(m_pBigIconButton,3,4,2,3);
171
167
        s = __tr2qs_ctx("The big icon associated to this action.<br>" \
172
168
                "It will appear at least in the toolbar buttons when this action is inserted.<br>" \
173
169
                "It has to be 32x32 pixels.","editor");
176
172
 
177
173
        l = new QLabel(__tr2qs_ctx("Key Sequence:","editor"),tab);
178
174
        gl->addWidget(l,4,0,2,1);
179
 
//      gl->addMultiCellWidget(l,4,5,0,0);
180
175
        m_pKeySequenceEdit = new QLineEdit(tab);
181
176
        gl->addWidget(m_pKeySequenceEdit,4,1,2,1);
182
 
//      gl->addMultiCellWidget(m_pKeySequenceEdit,4,5,1,1);
183
177
        m_pKeySequenceEdit->setToolTip(__tr2qs_ctx("Optional keyboard sequence that will activate this action.<br>" \
184
178
                "The sequence has to be expressed as a string of up to four key codes separated by commas " \
185
179
                "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \
187
181
 
188
182
        l = new QLabel(tab);
189
183
        gl->addWidget(l,6,0,1,4);
190
 
//      gl->addMultiCellWidget(l,6,6,0,3);
191
184
 
192
185
        gl->setColumnStretch(1,1);
193
186
        gl->setRowStretch(6,1);
194
187
 
195
 
 
196
188
        tw->addTab(tab,__tr2qs_ctx("Properties","editor"));
197
189
 
198
 
 
199
 
 
200
190
        // flags tab
201
191
        tab = new QWidget(tw);
202
192
        gl = new QGridLayout(tab);
417
407
                        QString t = m_pCategoryCombo->itemText(i);
418
408
                        int idx = t.lastIndexOf('(');
419
409
                        QString r = t.right(t.length() - (idx + 1));
420
 
                        QString r2 = r.left(r.length() - 1);
421
 
                        r2.trimmed();
 
410
                        QString r2 = r.left(r.length() - 1).trimmed();
422
411
                        if(r2 == d->m_szCategory)
423
412
                        {
424
413
                                m_pCategoryCombo->setCurrentIndex(i);