From d7c028099416f8cce1799e0a6849b263bcb69d58 Mon Sep 17 00:00:00 2001 From: mrexodia Date: Mon, 25 Jul 2016 23:44:07 +0200 Subject: [PATCH] GUI: AStyle + updated Translations --- src/gui/Src/BasicView/StdTable.cpp | 30 +++++++++++++++--------------- src/gui/Src/Gui/CPUSideBar.cpp | 2 +- src/gui/Translations | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gui/Src/BasicView/StdTable.cpp b/src/gui/Src/BasicView/StdTable.cpp index b2be868a..4d16683d 100644 --- a/src/gui/Src/BasicView/StdTable.cpp +++ b/src/gui/Src/BasicView/StdTable.cpp @@ -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; })); } diff --git a/src/gui/Src/Gui/CPUSideBar.cpp b/src/gui/Src/Gui/CPUSideBar.cpp index 67283685..3b5a1e48 100644 --- a/src/gui/Src/Gui/CPUSideBar.cpp +++ b/src/gui/Src/Gui/CPUSideBar.cpp @@ -749,7 +749,7 @@ void CPUSideBar::AllocateJumpOffsets(std::vector & 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; } diff --git a/src/gui/Translations b/src/gui/Translations index 98a8e1e0..55966dab 160000 --- a/src/gui/Translations +++ b/src/gui/Translations @@ -1 +1 @@ -Subproject commit 98a8e1e0bcfcfc627658a3f050d8ccd05b6bab21 +Subproject commit 55966dab29e217cbf5ab5409ddc25780708c4ecf