arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 23:47:21 +00:00
Code Issues Projects Releases Wiki Activity

added qt5 build

Browse Source
This commit is contained in:
arcan1s 2014-04-06 22:59:12 +04:00
parent 9a5b61be4e
commit 72782a40c2
9 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sources/CMakeLists.txt
View File

@ -37,9 +37,9 @@ add_subdirectory (icons)
if (BUILD_GUI) if (BUILD_GUI)
add_subdirectory (gui) add_subdirectory (gui)
endif () endif ()
if (BUILD_DATAENGINE) # if (BUILD_DATAENGINE)
add_subdirectory (dataengine) # add_subdirectory (dataengine)
endif () # endif ()
if (BUILD_PLASMOID) # if (BUILD_PLASMOID)
add_subdirectory (plasmoid) # add_subdirectory (plasmoid)
endif () # endif ()

23
sources/gui/src/CMakeLists.txt
View File

@ -14,29 +14,34 @@ message (STATUS "${SUBPROJECT} Forms: ${FORMS}")
# include_path # include_path
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../)
find_package (Qt4 REQUIRED) find_package(Qt5Core REQUIRED)
include (${QT_USE_FILE}) find_package(Qt5Widgets REQUIRED)
qt4_wrap_cpp (MOC_SOURCES ${HEADERS}) find_package(Qt5LinguistTools REQUIRED)
qt4_wrap_ui (UI_HEADERS ${FORMS}) add_definitions(${Qt5Core_DEFINITIONS})
qt4_add_resources (QRC_SOURCES ${RESOURCES}) add_definitions(${Qt5Widgets_DEFINITIONS})
add_definitions(${Qt5LinguistTools_DEFINITIONS})
qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
qt5_wrap_ui (UI_HEADERS ${FORMS})
qt5_add_resources (QRC_SOURCES ${RESOURCES})
foreach (LANGUAGE ${LANGUAGES}) foreach (LANGUAGE ${LANGUAGES})
set (TS ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts) set (TS ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts)
set (QM ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm) set (QM ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm)
set (TRANSLATIONS ${TRANSLATIONS} ${TS}) set (TRANSLATIONS ${TRANSLATIONS} ${TS})
set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM}) set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
add_custom_command (OUTPUT ${QM} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS}) add_custom_command (OUTPUT ${QM} COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
endforeach () endforeach ()
add_custom_target (translations COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS}) add_custom_target (translations COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
add_custom_command (TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS}) add_custom_command (TARGET translations COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}") message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}")
source_group ("Header Files" FILES ${HEADERS}) source_group ("Header Files" FILES ${HEADERS})
source_group ("Source Files" FILES ${SOURCES}) source_group ("Source Files" FILES ${SOURCES})
source_group ("Generated Files" FILES ${MOC_SOURCES}) source_group ("Generated Files" FILES ${MOC_SOURCES})
include_directories (${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS}) add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
target_link_libraries (${SUBPROJECT} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) target_link_libraries (${SUBPROJECT} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES})
# install properties # install properties
install (TARGETS ${SUBPROJECT} DESTINATION bin) install (TARGETS ${SUBPROJECT} DESTINATION bin)

4
sources/gui/src/ethernetwidget.cpp
View File

@ -86,7 +86,7 @@ void EthernetWidget::selectWpaConfig()
void EthernetWidget::showAdvanced() void EthernetWidget::showAdvanced()
{ {
if (ui->pushButton_ethernetAdvanced->isChecked()) { if (ui->pushButton_ethernetAdvanced->isChecked()) {
ui->widget_ethernetAdvanced->setShown(true); ui->widget_ethernetAdvanced->setHidden(false);
ui->pushButton_ethernetAdvanced->setText(QApplication::translate("EthernetWidget", "Hide advanced")); ui->pushButton_ethernetAdvanced->setText(QApplication::translate("EthernetWidget", "Hide advanced"));
} }
else { else {
@ -101,7 +101,7 @@ void EthernetWidget::showWpa(const int state)
if (state == 0) if (state == 0)
ui->widget_wpa->setHidden(true); ui->widget_wpa->setHidden(true);
else else
ui->widget_wpa->setShown(true); ui->widget_wpa->setHidden(false);
} }

2
sources/gui/src/generalwidget.cpp
View File

@ -112,7 +112,7 @@ void GeneralWidget::keyPressEvent(QKeyEvent *pressedKey)
void GeneralWidget::showAdvanced() void GeneralWidget::showAdvanced()
{ {
if (ui->pushButton_generalAdvanced->isChecked()) { if (ui->pushButton_generalAdvanced->isChecked()) {
ui->widget_generalAdvanced->setShown(true); ui->widget_generalAdvanced->setHidden(false);
ui->pushButton_generalAdvanced->setText(QApplication::translate("GeneralWidget", "Hide advanced")); ui->pushButton_generalAdvanced->setText(QApplication::translate("GeneralWidget", "Hide advanced"));
} }
else { else {

10
sources/gui/src/ipwidget.cpp
View File

@ -306,7 +306,7 @@ void IpWidget::changeIpMode(const QString currentText)
if (currentText == QString("dhcp")) if (currentText == QString("dhcp"))
ui->widget_ip->setHidden(true); ui->widget_ip->setHidden(true);
else if (currentText == QString("static")) else if (currentText == QString("static"))
ui->widget_ip->setShown(true); ui->widget_ip->setHidden(false);
} }
@ -332,7 +332,7 @@ void IpWidget::changeIp6Mode(const QString currentText)
ui->widget_ip6->setHidden(true); ui->widget_ip6->setHidden(true);
else if ((currentText == QString("static")) || else if ((currentText == QString("static")) ||
(currentText == QString("stateless"))) (currentText == QString("stateless")))
ui->widget_ip6->setShown(true); ui->widget_ip6->setHidden(false);
} }
@ -354,12 +354,12 @@ void IpWidget::ip6Enable(const int state)
void IpWidget::changeDhcpClient(const QString currentText) void IpWidget::changeDhcpClient(const QString currentText)
{ {
if (currentText == QString("dhcpcd")) { if (currentText == QString("dhcpcd")) {
ui->widget_dhcpcdOpt->setShown(true); ui->widget_dhcpcdOpt->setHidden(false);
ui->widget_dhclientOpt->setHidden(true); ui->widget_dhclientOpt->setHidden(true);
} }
else if (currentText == QString("dhclient")) { else if (currentText == QString("dhclient")) {
ui->widget_dhcpcdOpt->setHidden(true); ui->widget_dhcpcdOpt->setHidden(true);
ui->widget_dhclientOpt->setShown(true); ui->widget_dhclientOpt->setHidden(false);
} }
} }
@ -367,7 +367,7 @@ void IpWidget::changeDhcpClient(const QString currentText)
void IpWidget::showAdvanced() void IpWidget::showAdvanced()
{ {
if (ui->pushButton_ipAdvanced->isChecked()) { if (ui->pushButton_ipAdvanced->isChecked()) {
ui->widget_ipAdvanced->setShown(true); ui->widget_ipAdvanced->setHidden(false);
ui->pushButton_ipAdvanced->setText(QApplication::translate("IpWidget", "Hide advanced")); ui->pushButton_ipAdvanced->setText(QApplication::translate("IpWidget", "Hide advanced"));
} }
else { else {

4
sources/gui/src/mainwindow.cpp
View File

@ -224,7 +224,7 @@ void MainWindow::updateMainTab()
ui->tableWidget_main->setSortingEnabled(true); ui->tableWidget_main->setSortingEnabled(true);
ui->tableWidget_main->resizeRowsToContents(); ui->tableWidget_main->resizeRowsToContents();
ui->tableWidget_main->horizontalHeader()->setResizeMode(QHeaderView::Stretch); ui->tableWidget_main->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
ui->tabWidget->setEnabled(true); ui->tabWidget->setEnabled(true);
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated")); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));
@ -284,7 +284,7 @@ void MainWindow::updateWifiTab()
ui->tableWidget_wifi->setSortingEnabled(true); ui->tableWidget_wifi->setSortingEnabled(true);
ui->tableWidget_wifi->resizeRowsToContents(); ui->tableWidget_wifi->resizeRowsToContents();
ui->tableWidget_wifi->horizontalHeader()->setResizeMode(QHeaderView::Stretch); ui->tableWidget_wifi->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
ui->tabWidget->setEnabled(true); ui->tabWidget->setEnabled(true);
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated")); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));

2
sources/gui/src/mobilewidget.cpp
View File

@ -87,7 +87,7 @@ void MobileWidget::selectOptionsFile()
void MobileWidget::showAdvanced() void MobileWidget::showAdvanced()
{ {
if (ui->pushButton_mobileAdvanced->isChecked()) { if (ui->pushButton_mobileAdvanced->isChecked()) {
ui->widget_mobileAdvanced->setShown(true); ui->widget_mobileAdvanced->setHidden(false);
ui->pushButton_mobileAdvanced->setText(QApplication::translate("MobileWidget", "Hide advanced")); ui->pushButton_mobileAdvanced->setText(QApplication::translate("MobileWidget", "Hide advanced"));
} }
else { else {

4
sources/gui/src/pppoewidget.cpp
View File

@ -96,7 +96,7 @@ void PppoeWidget::changeMode(const QString currentText)
if (currentText == QString("persist")) if (currentText == QString("persist"))
ui->widget_timeout->setHidden(true); ui->widget_timeout->setHidden(true);
else if (currentText == QString("demand")) else if (currentText == QString("demand"))
ui->widget_timeout->setShown(true); ui->widget_timeout->setHidden(false);
} }
@ -115,7 +115,7 @@ void PppoeWidget::selectOptionsFile()
void PppoeWidget::showAdvanced() void PppoeWidget::showAdvanced()
{ {
if (ui->pushButton_pppoeAdvanced->isChecked()) { if (ui->pushButton_pppoeAdvanced->isChecked()) {
ui->widget_pppoeAdvanced->setShown(true); ui->widget_pppoeAdvanced->setHidden(false);
ui->pushButton_pppoeAdvanced->setText(QApplication::translate("PppoeWidget", "Hide advanced")); ui->pushButton_pppoeAdvanced->setText(QApplication::translate("PppoeWidget", "Hide advanced"));
} }
else { else {

12
sources/gui/src/wirelesswidget.cpp
View File

@ -153,28 +153,28 @@ void WirelessWidget::addOption()
void WirelessWidget::changeSecurity(const QString currentText) void WirelessWidget::changeSecurity(const QString currentText)
{ {
if (currentText == QString("none")) { if (currentText == QString("none")) {
ui->widget_essid->setShown(true); ui->widget_essid->setHidden(false);
ui->widget_wpaConfigSection->setHidden(true); ui->widget_wpaConfigSection->setHidden(true);
ui->widget_wpaConfig->setHidden(true); ui->widget_wpaConfig->setHidden(true);
ui->widget_key->setHidden(true); ui->widget_key->setHidden(true);
} }
else if ((currentText == QString("wep")) || else if ((currentText == QString("wep")) ||
(currentText == QString("wpa"))) { (currentText == QString("wpa"))) {
ui->widget_essid->setShown(true); ui->widget_essid->setHidden(false);
ui->widget_wpaConfigSection->setHidden(true); ui->widget_wpaConfigSection->setHidden(true);
ui->widget_wpaConfig->setHidden(true); ui->widget_wpaConfig->setHidden(true);
ui->widget_key->setShown(true); ui->widget_key->setHidden(false);
} }
else if (currentText == QString("wpa-configsection")) { else if (currentText == QString("wpa-configsection")) {
ui->widget_essid->setHidden(true); ui->widget_essid->setHidden(true);
ui->widget_wpaConfigSection->setShown(true); ui->widget_wpaConfigSection->setHidden(false);
ui->widget_wpaConfig->setHidden(true); ui->widget_wpaConfig->setHidden(true);
ui->widget_key->setHidden(true); ui->widget_key->setHidden(true);
} }
else if (currentText == QString("wpa-config")) { else if (currentText == QString("wpa-config")) {
ui->widget_essid->setHidden(true); ui->widget_essid->setHidden(true);
ui->widget_wpaConfigSection->setHidden(true); ui->widget_wpaConfigSection->setHidden(true);
ui->widget_wpaConfig->setShown(true); ui->widget_wpaConfig->setHidden(false);
ui->widget_key->setHidden(true); ui->widget_key->setHidden(true);
} }
} }
@ -195,7 +195,7 @@ void WirelessWidget::selectWpaConfig()
void WirelessWidget::showAdvanced() void WirelessWidget::showAdvanced()
{ {
if (ui->pushButton_wirelessAdvanced->isChecked()) { if (ui->pushButton_wirelessAdvanced->isChecked()) {
ui->widget_wirelessAdvanced->setShown(true); ui->widget_wirelessAdvanced->setHidden(false);
ui->pushButton_wirelessAdvanced->setText(QApplication::translate("WirelessWidget", "Hide advanced")); ui->pushButton_wirelessAdvanced->setText(QApplication::translate("WirelessWidget", "Hide advanced"));
} }
else { else {