From de12d75606351da15c02acf560fa605108b1e88e Mon Sep 17 00:00:00 2001 From: Benjamin Nauck Date: Tue, 12 Jan 2016 00:16:48 +0100 Subject: [PATCH 1/3] Make 'V' in "Valentina" upper case on osx This will change: * the filename of the application to "Valentina.app", * the name in the menubar to "Valentina", and * the about item so it says "About Valentina" instead of "About valentina" Almost every application on OS X capitalizes their name. The only exceptions on my computer are apple's i-products (but there the second letter is upper case instead) --HG-- branch : feature --- src/app/valentina/valentina.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 70937f11b..aa8700e03 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -17,7 +17,11 @@ QT += core gui widgets xml svg printsupport xmlpatterns TEMPLATE = app # Name of binary file -TARGET = valentina +macx{ + TARGET = Valentina +} else { + TARGET = valentina +} # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target From 48bf54dfd93ef35de55435587dcef9a03e7725a7 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Wed, 13 Jan 2016 10:55:10 +0200 Subject: [PATCH 2/3] All table should not be editable --HG-- branch : develop --- src/app/valentina/dialogs/dialoghistory.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index f37847393..feb1396e7 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -177,6 +177,9 @@ void DialogHistory::FillTable() item->setFlags(item->flags() ^ Qt::ItemIsEditable); ui->tableWidget->setItem(currentRow, 1, item); ++count; + + item = ui->tableWidget->item(currentRow, 0); + item->setFlags(item->flags() ^ Qt::ItemIsEditable); } } ui->tableWidget->setRowCount(count);//Real row count From bc1664a27571645062fa7b97d1dc3def95b3ba1d Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Wed, 13 Jan 2016 11:22:39 +0200 Subject: [PATCH 3/3] Better way to do table not editable --HG-- branch : develop --- src/app/valentina/dialogs/dialoghistory.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index feb1396e7..429f34bcb 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -169,6 +169,7 @@ void DialogHistory::FillTable() QTableWidgetItem *item = new QTableWidgetItem(QString()); item->setTextAlignment(Qt::AlignHCenter); item->setData(Qt::UserRole, tool.getId()); + item->setFlags(item->flags() ^ Qt::ItemIsEditable); ui->tableWidget->setItem(currentRow, 0, item); } @@ -177,9 +178,6 @@ void DialogHistory::FillTable() item->setFlags(item->flags() ^ Qt::ItemIsEditable); ui->tableWidget->setItem(currentRow, 1, item); ++count; - - item = ui->tableWidget->item(currentRow, 0); - item->setFlags(item->flags() ^ Qt::ItemIsEditable); } } ui->tableWidget->setRowCount(count);//Real row count