1
0
Fork 0

GUI: AStyle + updated Translations

This commit is contained in:
mrexodia 2016-07-25 23:44:07 +02:00
parent fc6a125810
commit d7c0280994
No known key found for this signature in database
GPG Key ID: D72F9A4FAA0073B4
3 changed files with 17 additions and 17 deletions

View File

@ -444,7 +444,7 @@ void StdTable::setupCopyMenu(QMenu* copyMenu)
}
}
void StdTable::setupCopyMenu(MenuBuilder *copyMenu)
void StdTable::setupCopyMenu(MenuBuilder* copyMenu)
{
if(!getColumnCount())
return;
@ -457,21 +457,21 @@ void StdTable::setupCopyMenu(MenuBuilder *copyMenu)
//Copy->Separator
copyMenu->addSeparator();
//Copy->ColName
copyMenu->addBuilder(new MenuBuilder(this, [this](QMenu* menu)
copyMenu->addBuilder(new MenuBuilder(this, [this](QMenu * menu)
{
for(int i = 0; i < getColumnCount(); i++)
{
if(!getCellContent(getInitialSelection(), i).length()) //skip empty cells
continue;
QString title = mCopyTitles.at(i);
if(!title.length()) //skip empty copy titles
continue;
QAction* action = new QAction(title, menu);
action->setObjectName(QString::number(i));
connect(action, SIGNAL(triggered()), this, SLOT(copyEntrySlot()));
menu->addAction(action);
}
return true;
for(int i = 0; i < getColumnCount(); i++)
{
if(!getCellContent(getInitialSelection(), i).length()) //skip empty cells
continue;
QString title = mCopyTitles.at(i);
if(!title.length()) //skip empty copy titles
continue;
QAction* action = new QAction(title, menu);
action->setObjectName(QString::number(i));
connect(action, SIGNAL(triggered()), this, SLOT(copyEntrySlot()));
menu->addAction(action);
}
return true;
}));
}

View File

@ -749,7 +749,7 @@ void CPUSideBar::AllocateJumpOffsets(std::vector<JumpLine> & jumpLines, std::vec
if(numLines[i->line + viewableRows] != 0)
i->endX = viewportWidth - numLines[i->line + viewableRows] * JumpPadding - 15 - fontHeight; // This expression should be consistent with drawJump
else
i->endX = viewportWidth - 1- 11 - (isFoldingGraphicsPresent(i->line) != 0 ? mBulletRadius + fontHeight : 0);
i->endX = viewportWidth - 1 - 11 - (isFoldingGraphicsPresent(i->line) != 0 ? mBulletRadius + fontHeight : 0);
}
delete[] numLines;
}

@ -1 +1 @@
Subproject commit 98a8e1e0bcfcfc627658a3f050d8ccd05b6bab21
Subproject commit 55966dab29e217cbf5ab5409ddc25780708c4ecf