From 0ead577cac5ca51c26861d806ae6c7340ecf6e79 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sat, 1 Mar 2014 19:02:03 +0100 Subject: [PATCH] Update tweaking. --- CMakeLists.txt | 10 +++++----- src/gui/formupdate.cpp | 4 +++- src/gui/formupdate.ui | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa2af55e4..3533fb2b9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -466,11 +466,11 @@ include_directories ( # Setup compilation for Qt 5. if(${USE_QT_5}) add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE - ${APP_SOURCES} - ${APP_FORMS} - ${APP_RCC} - ${APP_QM} - ) + ${APP_SOURCES} + ${APP_FORMS} + ${APP_RCC} + ${APP_QM} + ) if(WIN32) target_link_libraries(${EXE_NAME} Qt5::WinMain) diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index e8c7c7126..f3c552aad 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -78,8 +78,10 @@ void FormUpdate::checkForUpdates() { tr("New release available."), tr("This is new version which can be\ndownloaded and installed.")); // TODO: Display "update" button if - // URL of file for current platform + // URL of file for current platform (Windows or OS2) // is available. + // TODO: Tady po stisku update tlacitka se provede + // stazeni archivu do tempu. #else m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, tr("New release available."), diff --git a/src/gui/formupdate.ui b/src/gui/formupdate.ui index abfd50e6f..dbc6a4c96 100755 --- a/src/gui/formupdate.ui +++ b/src/gui/formupdate.ui @@ -56,7 +56,7 @@ false - QTextEdit::NoWrap + QTextEdit::WidgetWidth true @@ -65,8 +65,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse