Mercurial > trustbridge
changeset 407:af53c40e74b1
Rename m13ui to TrustBridge
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 16 Apr 2014 13:38:11 +0000 |
| parents | 5ee694fa3da7 |
| children | ac9e95ef6966 |
| files | ui/CMakeLists.txt ui/main.cpp ui/mainwindow.cpp ui/tests/CMakeLists.txt |
| diffstat | 4 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/CMakeLists.txt Wed Apr 16 13:31:16 2014 +0000 +++ b/ui/CMakeLists.txt Wed Apr 16 13:38:11 2014 +0000 @@ -20,7 +20,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/sslconnection.cpp ) -set(M13UI_SOURCES +set(TRUSTBRIDGE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/helpdialog.cpp @@ -44,7 +44,7 @@ ) # Seperated to make it easier to include the sources in tests -set(M13UI_RESOURCES +set(TRUSTBRIDGE_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/icons.qrc ${CMAKE_CURRENT_SOURCE_DIR}/certs.qrc ) @@ -91,16 +91,16 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -generate_cppcheck(SOURCES ${CINST_SOURCES} ${M13UI_SOURCES} TARGET_NAME m13_cppcheck) +generate_cppcheck(SOURCES ${CINST_SOURCES} ${TRUSTBRIDGE_SOURCES} TARGET_NAME m13_cppcheck) add_dependencies(static_check m13_cppcheck) # Adding resources here in an extra variable to enable reuse of -# M13UI_SOURCES in the test subdirectory. -set(M13UI_SOURCES_WITH_RESOURCES ${M13UI_SOURCES}) -qt5_add_resources(M13UI_SOURCES_WITH_RESOURCES ${M13UI_RESOURCES}) -add_executable(m13ui ${M13UI_SOURCES_WITH_RESOURCES}) +# TRUSTBRIDGE_SOURCES in the test subdirectory. +set(TRUSTBRIDGE_SOURCES_WITH_RESOURCES ${TRUSTBRIDGE_SOURCES}) +qt5_add_resources(TRUSTBRIDGE_SOURCES_WITH_RESOURCES ${TRUSTBRIDGE_RESOURCES}) +add_executable(trustbridge ${TRUSTBRIDGE_SOURCES_WITH_RESOURCES}) -target_link_libraries(m13ui Qt5::Widgets +target_link_libraries(trustbridge Qt5::Widgets m13_common ${POLARSSL_LIBRARIES} ${EXTRA_STATIC_LIBS} @@ -119,5 +119,5 @@ # Tests add_subdirectory(tests) -install(TARGETS m13ui DESTINATION bin) +install(TARGETS trustbridge DESTINATION bin) install(TARGETS administrator DESTINATION bin)
--- a/ui/main.cpp Wed Apr 16 13:31:16 2014 +0000 +++ b/ui/main.cpp Wed Apr 16 13:38:11 2014 +0000 @@ -18,7 +18,7 @@ #endif #ifndef APPNAME -#define APPNAME "m13ui" +#define APPNAME "TrustBridge" #endif #ifndef ORGANIZATION
--- a/ui/mainwindow.cpp Wed Apr 16 13:31:16 2014 +0000 +++ b/ui/mainwindow.cpp Wed Apr 16 13:38:11 2014 +0000 @@ -242,7 +242,7 @@ mTrayIcon->setIcon(trayImg); setWindowIcon(trayImg); mTrayIcon->show(); - mTrayIcon->setToolTip(tr("m13ui")); + mTrayIcon->setToolTip(tr("TrustBridge")); connect(mTrayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked())); }
--- a/ui/tests/CMakeLists.txt Wed Apr 16 13:31:16 2014 +0000 +++ b/ui/tests/CMakeLists.txt Wed Apr 16 13:38:11 2014 +0000 @@ -45,7 +45,7 @@ # Downloader if (HIAWATHA_EXECUTABLE) set(DOWNLOADER_SOURCES_WITH_RESOURCES ${DOWNLOADER_SOURCES}) - qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${M13UI_RESOURCES}) + qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${TRUSTBRIDGE_RESOURCES}) add_m13_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}") endif() @@ -73,5 +73,5 @@ add_dependencies(nsstest mozilla) endif() -#add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${M13UI_SOURCES}") +#add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${TRUSTBRIDGE_SOURCES}")