Commit 49f8a555 authored by con's avatar con
Browse files

Merge commit 'origin/1.2'

parents 23b952e3 f9b628ba
......@@ -23,9 +23,7 @@ qch_docs.files = $$QCH_FILE
unix:!macx {
system("mkdir -p `dirname $$QCH_FILE` && touch $$QCH_FILE")
}
unix:!macx {
qch_docs.path = /share/doc/qtcreator
INSTALLS += qch_docs
}
......
......@@ -851,6 +851,102 @@ static void qDumpInnerValueOrPointer(QDumper &d,
//////////////////////////////////////////////////////////////////////////////
struct ModelIndex { int r; int c; void *p; void *m; };
static void qDumpQAbstractItem(QDumper &d)
{
ModelIndex mm;
mm.r = mm.c = 0;
mm.p = mm.m = 0;
sscanf(d.templateParameters[0], "%d,%d,%p,%p", &mm.r, &mm.c, &mm.p, &mm.m);
const QModelIndex &mi(*reinterpret_cast<QModelIndex *>(&mm));
const QAbstractItemModel *m = mi.model();
const int rowCount = m->rowCount(mi);
if (rowCount < 0)
return;
const int columnCount = m->columnCount(mi);
if (columnCount < 0)
return;
P(d, "type", NS"QAbstractItem");
P(d, "addr", "$" << mm.r << "," << mm.c << "," << mm.p << "," << mm.m);
//P(d, "value", "(" << rowCount << "," << columnCount << ")");
P(d, "value", m->data(mi, Qt::DisplayRole).toString());
P(d, "valueencoded", "2");
P(d, "numchild", "1");
if (d.dumpChildren) {
d << ",children=[";
for (int row = 0; row < rowCount; ++row) {
for (int column = 0; column < columnCount; ++column) {
QModelIndex child = m->index(row, column, mi);
d.beginHash();
P(d, "name", "[" << row << "," << column << "]");
//P(d, "numchild", (m->hasChildren(child) ? "1" : "0"));
P(d, "numchild", "1");
P(d, "addr", "$" << child.row() << "," << child.column() << ","
<< child.internalPointer() << "," << child.model());
P(d, "type", NS"QAbstractItem");
P(d, "value", m->data(mi, Qt::DisplayRole).toString());
P(d, "valueencoded", "2");
d.endHash();
}
}
d.beginHash();
P(d, "name", "DisplayRole");
P(d, "numchild", 0);
P(d, "value", m->data(mi, Qt::DisplayRole).toString());
P(d, "valueencoded", 2);
P(d, "type", NS"QString");
d.endHash();
d << "]";
}
d.disarm();
}
static void qDumpQAbstractItemModel(QDumper &d)
{
const QAbstractItemModel &m = *reinterpret_cast<const QAbstractItemModel *>(d.data);
const int rowCount = m.rowCount();
if (rowCount < 0)
return;
const int columnCount = m.columnCount();
if (columnCount < 0)
return;
P(d, "type", NS"QAbstractItemModel");
P(d, "value", "(" << rowCount << "," << columnCount << ")");
P(d, "numchild", "1");
if (d.dumpChildren) {
d << ",children=[";
d.beginHash();
P(d, "numchild", "1");
P(d, "name", NS"QObject");
P(d, "addr", d.data);
P(d, "value", m.objectName());
P(d, "valueencoded", "2");
P(d, "type", NS"QObject");
P(d, "displayedtype", m.metaObject()->className());
d.endHash();
for (int row = 0; row < rowCount; ++row) {
for (int column = 0; column < columnCount; ++column) {
QModelIndex mi = m.index(row, column);
d.beginHash();
P(d, "name", "[" << row << "," << column << "]");
P(d, "value", m.data(mi, Qt::DisplayRole).toString());
P(d, "valueencoded", "2");
//P(d, "numchild", (m.hasChildren(mi) ? "1" : "0"));
P(d, "numchild", "1");
P(d, "addr", "$" << mi.row() << "," << mi.column() << ","
<< mi.internalPointer() << "," << mi.model());
P(d, "type", NS"QAbstractItem");
d.endHash();
}
}
d << "]";
}
d.disarm();
}
static void qDumpQByteArray(QDumper &d)
{
const QByteArray &ba = *reinterpret_cast<const QByteArray *>(d.data);
......@@ -1210,7 +1306,7 @@ static void qDumpQImage(QDumper &d)
if (d.dumpChildren) {
d << ",children=[";
d.beginHash();
P(d, "name", "key");
P(d, "name", "data");
P(d, "type", NS "QImageData");
P(d, "addr", d.data);
d.endHash();
......@@ -2533,7 +2629,8 @@ static void handleProtocolVersion2and3(QDumper & d)
d.setupTemplateParameters();
P(d, "iname", d.iname);
P(d, "addr", d.data);
if (d.data)
P(d, "addr", d.data);
#ifdef QT_NO_QDATASTREAM
if (d.protocolVersion == 3) {
......@@ -2555,6 +2652,12 @@ static void handleProtocolVersion2and3(QDumper & d)
if (isEqual(type, "map"))
qDumpStdMap(d);
break;
case 'A':
if (isEqual(type, "QAbstractItemModel"))
qDumpQAbstractItemModel(d);
else if (isEqual(type, "QAbstractItem"))
qDumpQAbstractItem(d);
break;
case 'B':
if (isEqual(type, "QByteArray"))
qDumpQByteArray(d);
......@@ -2715,6 +2818,8 @@ void *qDumpObjectData440(
// They are mentioned here nevertheless. For types that are not listed
// here, dumpers won't be used.
d << "dumpers=["
"\""NS"QAbstractItem\","
"\""NS"QAbstractItemModel\","
"\""NS"QByteArray\","
"\""NS"QDateTime\","
"\""NS"QDir\","
......@@ -2810,7 +2915,6 @@ void *qDumpObjectData440(
d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
d.exp = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
d.innertype = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer;
handleProtocolVersion2and3(d);
}
......
......@@ -5,29 +5,22 @@ TEMPLATE = app
TARGET = $$IDE_APP_TARGET
DESTDIR = $$IDE_APP_PATH
SOURCES += main.cpp
include(../rpath.pri)
win32 {
RC_FILE = qtcreator.rc
}
macx {
ICON = qtcreator.icns
QMAKE_INFO_PLIST = Info.plist
}
CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
else:LIBS *= -lExtensionSystem -lAggregation
macx {
RC_FILE = qtcreator.rc
} else:macx {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
else:LIBS *= -lExtensionSystem -lAggregation
}
win32 {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
else:LIBS *= -lExtensionSystem -lAggregation
}
unix:!macx {
ICON = qtcreator.icns
QMAKE_INFO_PLIST = Info.plist
} else {
LIBS *= -lExtensionSystem -lAggregation
target.path = /bin
......
......@@ -46,7 +46,7 @@
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MAC
# include <sys/resource.h>
#endif
......@@ -71,7 +71,7 @@ static const char *CLIENT_OPTION = "-client";
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;
// Helpers for displaying messages. Note that there is no console on Windows.
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
// Format as <pre> HTML
static inline void toHtml(QString &t)
{
......@@ -204,7 +204,7 @@ static inline QStringList getPluginPaths()
int main(int argc, char **argv)
{
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MAC
// increase the number of file that can be opened in Qt Creator.
struct rlimit rl;
getrlimit(RLIMIT_NOFILE, &rl);
......
......@@ -59,7 +59,7 @@ public:
//signals:
virtual void processError(const QString &error) = 0;
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
// Add PATH and SystemRoot environment variables in case they are missing
static QStringList fixWinEnvironment(const QStringList &env);
// Quote a Windows command line correctly for the "CreateProcess" API
......
......@@ -44,11 +44,10 @@
#include <QtGui/QToolButton>
#include <QtGui/QPushButton>
#ifdef Q_OS_MAC
/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
#ifdef Q_WS_MAC
QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Choose...");
#else
/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Browse...");
#endif
......@@ -128,7 +127,7 @@ PathChooser::~PathChooser()
void PathChooser::addButton(const QString &text, QObject *receiver, const char *slotFunc)
{
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
QPushButton *button = new QPushButton;
#else
QToolButton *button = new QToolButton;
......
......@@ -86,7 +86,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
m_toggleAction = new QAction(tr("Toggle Bookmark"), this);
Core::Command *cmd =
am->registerAction(m_toggleAction, BOOKMARKS_TOGGLE_ACTION, textcontext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+M")));
#else
cmd->setDefaultKeySequence(QKeySequence(tr("Meta+M")));
......@@ -116,7 +116,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
//Previous
m_prevAction = new QAction(tr("Previous Bookmark"), this);
cmd = am->registerAction(m_prevAction, BOOKMARKS_PREV_ACTION, globalcontext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+,")));
#else
cmd->setDefaultKeySequence(QKeySequence(tr("Meta+,")));
......@@ -126,7 +126,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
//Next
m_nextAction = new QAction(tr("Next Bookmark"), this);
cmd = am->registerAction(m_nextAction, BOOKMARKS_NEXT_ACTION, globalcontext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+.")));
#else
cmd->setDefaultKeySequence(QKeySequence(tr("Meta+.")));
......
......@@ -361,7 +361,7 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const
baseAction->setEnabled(false);
baseAction->setObjectName(id);
baseAction->setParent(m_mainWnd);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
baseAction->setIconVisibleInMenu(false);
#endif
a->setAction(baseAction);
......
......@@ -170,9 +170,11 @@ FORMS += dialogs/newdialog.ui \
welcomemode.ui
RESOURCES += core.qrc \
fancyactionbar.qrc
linux-* {
unix:!macx {
images.files = images/qtcreator_logo_*.png
images.path = /share/pixmaps
INSTALLS += images
}
OTHER_FILES += Core.pluginspec
......@@ -344,7 +344,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_splitAction = new QAction(tr("Split"), this);
cmd = am->registerAction(m_d->m_splitAction, Constants::SPLIT, editManagerContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,2")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
......@@ -352,7 +352,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,3")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
......@@ -360,7 +360,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
cmd = am->registerAction(m_d->m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,0")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
......@@ -368,7 +368,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
cmd = am->registerAction(m_d->m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,1")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
......@@ -376,7 +376,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
m_d->m_gotoOtherSplitAction = new QAction(tr("Goto Other Split"), this);
cmd = am->registerAction(m_d->m_gotoOtherSplitAction, Constants::GOTO_OTHER_SPLIT, editManagerContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,o")));
#endif
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
......
......@@ -85,7 +85,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
QPainter p(this);
p.drawPicture(0, 0, m_buttonElements.value(svgIdButtonBase));
p.drawPicture(0, 0, m_buttonElements.value(isDown() ? svgIdButtonPressedBase : svgIdButtonNormalBase));
#ifndef Q_WS_MAC // Mac UI's dont usually do hover
#ifndef Q_WS_MAC // Mac UIs usually don't hover
if (underMouse() && isEnabled())
p.drawPicture(0, 0, m_buttonElements.value(svgIdButtonHoverOverlay));
#endif
......
......@@ -70,7 +70,7 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo)
// Disabled since for now we'll make sure that all icons fit with our
// own custom icons by returning an empty one if we don't know it.
#ifdef Q_OS_WIN
#ifdef Q_WS_WIN
// This is incorrect if the OS does not always return the same icon for the
// same suffix (Mac OS X), but should speed up the retrieval a lot ...
icon = m_systemIconProvider.icon(fileInfo);
......@@ -123,7 +123,7 @@ void FileIconProvider::registerIconOverlayForSuffix(const QIcon &icon, const QSt
QIcon FileIconProvider::iconForSuffix(const QString &suffix) const
{
QIcon icon;
#ifndef Q_OS_WIN // On windows we use the file system icons
#ifndef Q_WS_WIN // On windows we use the file system icons
if (suffix.isEmpty())
return icon;
......
......@@ -144,7 +144,7 @@ MainWindow::MainWindow() :
m_optionsAction(0),
m_toggleSideBarAction(0),
m_toggleFullScreenAction(0),
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
m_minimizeAction(0),
m_zoomAction(0),
#endif
......@@ -153,7 +153,7 @@ MainWindow::MainWindow() :
OutputPaneManager::create();
setWindowTitle(tr("Qt Creator"));
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
#endif
QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
......@@ -597,7 +597,7 @@ void MainWindow::registerDefaultActions()
// Save As Action
tmpaction = new QAction(tr("Save &As..."), this);
cmd = am->registerAction(tmpaction, Constants::SAVEAS, m_globalContext);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
#endif
cmd->setAttribute(Command::CA_UpdateText);
......@@ -607,7 +607,7 @@ void MainWindow::registerDefaultActions()
// SaveAll Action
m_saveAllAction = new QAction(tr("Save A&ll"), this);
cmd = am->registerAction(m_saveAllAction, Constants::SAVEALL, m_globalContext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
#endif
mfile->addAction(cmd, Constants::G_FILE_SAVE);
......@@ -681,13 +681,13 @@ void MainWindow::registerDefaultActions()
// Options Action
m_optionsAction = new QAction(tr("&Options..."), this);
cmd = am->registerAction(m_optionsAction, Constants::OPTIONS, m_globalContext);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence("Ctrl+,"));
#endif
mtools->addAction(cmd, Constants::G_DEFAULT_THREE);
connect(m_optionsAction, SIGNAL(triggered()), this, SLOT(showOptionsDialog()));
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
// Minimize Action
m_minimizeAction = new QAction(tr("Minimize"), this);
cmd = am->registerAction(m_minimizeAction, Constants::MINIMIZE_WINDOW, m_globalContext);
......@@ -711,7 +711,7 @@ void MainWindow::registerDefaultActions()
tr("Show Sidebar"), this);
m_toggleSideBarAction->setCheckable(true);
cmd = am->registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR, m_globalContext);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence("Ctrl+0"));
#else
cmd->setDefaultKeySequence(QKeySequence("Alt+0"));
......@@ -721,7 +721,7 @@ void MainWindow::registerDefaultActions()
mwindow->addAction(cmd, Constants::G_WINDOW_PANES);
m_toggleSideBarAction->setEnabled(false);
#if !defined(Q_OS_MAC)
#ifndef Q_WS_MAC
// Full Screen Action
m_toggleFullScreenAction = new QAction(tr("Full Screen"), this);
m_toggleFullScreenAction->setCheckable(true);
......@@ -732,7 +732,7 @@ void MainWindow::registerDefaultActions()
#endif
// About IDE Action
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
tmpaction = new QAction(tr("About &Qt Creator"), this); // it's convention not to add dots to the about menu
#else
tmpaction = new QAction(tr("About &Qt Creator..."), this);
......@@ -746,7 +746,7 @@ void MainWindow::registerDefaultActions()
cmd = am->registerAction(tmpaction, Constants::ABOUT_PLUGINS, m_globalContext);
mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
tmpaction->setEnabled(true);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
cmd->action()->setMenuRole(QAction::ApplicationSpecificRole);
#endif
connect(tmpaction, SIGNAL(triggered()), this, SLOT(aboutPlugins()));
......@@ -1022,7 +1022,7 @@ void MainWindow::changeEvent(QEvent *e)
emit windowActivated();
}
} else if (e->type() == QEvent::WindowStateChange) {
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
bool minimized = isMinimized();
if (debugMainWindow)
qDebug() << "main window state changed to minimized=" << minimized;
......
......@@ -208,7 +208,7 @@ private:
QAction *m_optionsAction;
QAction *m_toggleSideBarAction;
QAction *m_toggleFullScreenAction;
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
QAction *m_minimizeAction;
QAction *m_zoomAction;
#endif
......
......@@ -147,7 +147,7 @@ void ModeManager::objectAdded(QObject *obj)
m_modeShortcuts.insert(index, cmd);
connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updateModeToolTip()));
for (int i = 0; i < m_modeShortcuts.size(); ++i) {
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
m_modeShortcuts.at(i)->setDefaultKeySequence(QKeySequence(QString("Meta+%1").arg(i+1)));
#else
m_modeShortcuts.at(i)->setDefaultKeySequence(QKeySequence(QString("Ctrl+%1").arg(i+1)));
......
......@@ -363,7 +363,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
m_navigationComboBox = new NavComboBox(this);
m_navigationWidget = 0;
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
// this is to avoid ugly tool bar behavior
m_navigationComboBox->setMaximumWidth(130);
#endif
......
......@@ -207,7 +207,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
m_buttonsWidget = new QWidget;
m_buttonsWidget->setLayout(new QHBoxLayout);
m_buttonsWidget->layout()->setContentsMargins(5,0,0,0);
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
m_buttonsWidget->layout()->setSpacing(16);
#else
m_buttonsWidget->layout()->setSpacing(4);
......@@ -299,7 +299,7 @@ void OutputPaneManager::init()
Command *cmd = am->registerAction(action, actionId, QList<int>() << Constants::C_GLOBAL_ID);
if (outPane->priorityInStatusBar() != -1) {
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(paneShortCut(Qt::CTRL, shortcutNumber)));
#else
cmd->setDefaultKeySequence(QKeySequence(paneShortCut(Qt::ALT, shortcutNumber)));
......@@ -567,7 +567,7 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text,
"QPushButton { border-image: url(:/core/images/panel_button.png) 2 2 2 19;"
" border-width: 2px 2px 2px 19px; padding-left: -17; padding-right: 4 } "
"QPushButton:checked { border-image: url(:/core/images/panel_button_checked.png) 2 2 2 19 } "
#ifndef Q_WS_MAC // Mac UI's dont usually do hover
#ifndef Q_WS_MAC // Mac UIs usually don't hover
"QPushButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 2 2 2 19 } "
"QPushButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 2 2 2 19 } "
"QPushButton:hover { border-image: url(:/core/images/panel_button_hover.png) 2 2 2 19 } "
......
......@@ -50,7 +50,7 @@ static int range(float x, int min, int max)
qreal StyleHelper::sidebarFontSize()
{
#if defined(Q_OS_MAC)
#if defined(Q_WS_MAC)
return 9;
#else
return 7.5;
......
......@@ -136,6 +136,8 @@ WelcomeMode::WelcomeMode() :
m_d->ui.sitesTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.tutorialTreeWidget->viewport()->setAutoFillBackground(false);
m_d->ui.didYouKnowTextBrowser->viewport()->setAutoFillBackground(false);
m_d->ui.helpUsLabel->setAttribute(Qt::WA_LayoutUsesWidgetRect);
m_d->ui.feedbackButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
l->addWidget(m_d->m_welcomePage);
updateWelcomePage(WelcomePageData());
......@@ -206,6 +208,7 @@ WelcomeMode::~WelcomeMode()
{
QSettings *settings = ICore::instance()->settings();
settings->setValue("General/WelcomeTab", m_d->btnGrp->checkedId());
delete m_d->m_widget;
delete m_d;
}
......
......@@ -100,7 +100,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
m_postAction = new QAction(tr("Paste Snippet..."), this);
command = actionManager->registerAction(m_postAction, "CodePaster.Post", globalcontext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
#endif
connect(m_postAction, SIGNAL(triggered()), this, SLOT(post()));
......@@ -108,7 +108,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
#ifndef Q_OS_MAC
#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
#endif
connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment