From 42369a8b8b3d8d74da210cf2db71510f127add95 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Fri, 25 Apr 2014 09:44:37 -0400 Subject: [PATCH 1/9] adding ui elements --- .../Makefile | 613 ++++++++++++++ .../GUI/ui/crash_report_window.ui | 59 +- .../GUI/ui/undone/advanced_settings.ui | 346 ++++++++ .../GUI/ui/undone/app_settings.ui | 346 ++++++++ commotion_client/GUI/ui/undone/app_viewer.ui | 785 ++++++++++++++++++ .../GUI/ui/undone/application_advertiser.ui | 346 ++++++++ .../GUI/ui/undone/basic_settings.ui | 346 ++++++++ .../GUI/ui/undone/config_editor.ui | 346 ++++++++ .../GUI/ui/undone/core_extensions_menu.ui | 346 ++++++++ commotion_client/GUI/ui/undone/csm.ui | 346 ++++++++ .../GUI/ui/undone/extension_manager.ui | 346 ++++++++ .../GUI/ui/undone/extension_settings.ui | 346 ++++++++ .../GUI/ui/undone/network_status_overview.ui | 308 +++++++ .../GUI/ui/undone/network_visualizer.ui | 346 ++++++++ .../GUI/ui/undone/settings_menu.ui | 346 ++++++++ .../GUI/ui/undone/setup_wizard.ui | 346 ++++++++ .../GUI/ui/undone/user_settings.ui | 346 ++++++++ commotion_client/GUI/ui/untitled/untitled.qml | 19 + .../GUI/ui/untitled/untitled.qmlproject | 20 + .../GUI/ui/untitled/untitled.qmlproject.user | 66 ++ .../GUI/ui/untitled1/deployment.pri | 27 + commotion_client/GUI/ui/untitled1/main.cpp | 12 + commotion_client/GUI/ui/untitled1/main.qml | 24 + commotion_client/GUI/ui/untitled1/qml.qrc | 5 + .../GUI/ui/untitled1/untitled1.pro | 13 + .../GUI/ui/untitled1/untitled1.pro.user | 251 ++++++ 26 files changed, 6691 insertions(+), 9 deletions(-) create mode 100644 commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile create mode 100644 commotion_client/GUI/ui/undone/advanced_settings.ui create mode 100644 commotion_client/GUI/ui/undone/app_settings.ui create mode 100644 commotion_client/GUI/ui/undone/app_viewer.ui create mode 100644 commotion_client/GUI/ui/undone/application_advertiser.ui create mode 100644 commotion_client/GUI/ui/undone/basic_settings.ui create mode 100644 commotion_client/GUI/ui/undone/config_editor.ui create mode 100644 commotion_client/GUI/ui/undone/core_extensions_menu.ui create mode 100644 commotion_client/GUI/ui/undone/csm.ui create mode 100644 commotion_client/GUI/ui/undone/extension_manager.ui create mode 100644 commotion_client/GUI/ui/undone/extension_settings.ui create mode 100644 commotion_client/GUI/ui/undone/network_status_overview.ui create mode 100644 commotion_client/GUI/ui/undone/network_visualizer.ui create mode 100644 commotion_client/GUI/ui/undone/settings_menu.ui create mode 100644 commotion_client/GUI/ui/undone/setup_wizard.ui create mode 100644 commotion_client/GUI/ui/undone/user_settings.ui create mode 100644 commotion_client/GUI/ui/untitled/untitled.qml create mode 100644 commotion_client/GUI/ui/untitled/untitled.qmlproject create mode 100644 commotion_client/GUI/ui/untitled/untitled.qmlproject.user create mode 100644 commotion_client/GUI/ui/untitled1/deployment.pri create mode 100644 commotion_client/GUI/ui/untitled1/main.cpp create mode 100644 commotion_client/GUI/ui/untitled1/main.qml create mode 100644 commotion_client/GUI/ui/untitled1/qml.qrc create mode 100644 commotion_client/GUI/ui/untitled1/untitled1.pro create mode 100644 commotion_client/GUI/ui/untitled1/untitled1.pro.user diff --git a/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile b/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile new file mode 100644 index 0000000..089e9be --- /dev/null +++ b/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile @@ -0,0 +1,613 @@ +############################################################################# +# Makefile for building: untitled1 +# Generated by qmake (3.0) (Qt 5.2.1) +# Project: ../untitled1/untitled1.pro +# Template: app +# Command: /opt/Qt/5.2.1/gcc/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro +############################################################################# + +MAKEFILE = Makefile + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_QUICK_LIB -DQT_QML_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB +CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +INCPATH = -I/opt/Qt/5.2.1/gcc/mkspecs/linux-g++ -I../untitled1 -I/opt/Qt/5.2.1/gcc/include -I/opt/Qt/5.2.1/gcc/include/QtQuick -I/opt/Qt/5.2.1/gcc/include/QtQml -I/opt/Qt/5.2.1/gcc/include/QtWidgets -I/opt/Qt/5.2.1/gcc/include/QtNetwork -I/opt/Qt/5.2.1/gcc/include/QtGui -I/opt/Qt/5.2.1/gcc/include/QtCore -I. -I. +LINK = g++ +LFLAGS = -Wl,-rpath,/opt/Qt/5.2.1/gcc -Wl,-rpath,/opt/Qt/5.2.1/gcc/lib +LIBS = $(SUBLIBS) -L/opt/Qt/5.2.1/gcc/lib -lQt5Quick -lQt5Qml -lQt5Widgets -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread +AR = ar cqs +RANLIB = +QMAKE = /opt/Qt/5.2.1/gcc/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = cp -f +COPY_DIR = cp -f -R +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = ../untitled1/main.cpp qrc_qml.cpp +OBJECTS = main.o \ + qrc_qml.o +DIST = /opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf \ + ../untitled1/deployment.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf \ + ../untitled1/untitled1.pro \ + ../untitled1/qml.qrc \ + ../untitled1/untitled1.pro +QMAKE_TARGET = untitled1 +DESTDIR = #avoid trailing-slash linebreak +TARGET = untitled1 + + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9][^0-9]*\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true + +Makefile: ../untitled1/untitled1.pro /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf /opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf \ + ../untitled1/deployment.pri \ + /opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf \ + /opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf \ + ../untitled1/untitled1.pro \ + ../untitled1/qml.qrc \ + /opt/Qt/5.2.1/gcc/lib/libQt5Quick.prl \ + /opt/Qt/5.2.1/gcc/lib/libQt5Qml.prl \ + /opt/Qt/5.2.1/gcc/lib/libQt5Network.prl \ + /opt/Qt/5.2.1/gcc/lib/libQt5Core.prl \ + /opt/Qt/5.2.1/gcc/lib/libQt5Gui.prl \ + /opt/Qt/5.2.1/gcc/lib/libQt5Widgets.prl + $(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro +/opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf: +/opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf: +/opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf: +/opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri: +/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri: +/opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf: +/opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf: +/opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf: +../untitled1/deployment.pri: +/opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf: +/opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf: +../untitled1/untitled1.pro: +../untitled1/qml.qrc: +/opt/Qt/5.2.1/gcc/lib/libQt5Quick.prl: +/opt/Qt/5.2.1/gcc/lib/libQt5Qml.prl: +/opt/Qt/5.2.1/gcc/lib/libQt5Network.prl: +/opt/Qt/5.2.1/gcc/lib/libQt5Core.prl: +/opt/Qt/5.2.1/gcc/lib/libQt5Gui.prl: +/opt/Qt/5.2.1/gcc/lib/libQt5Widgets.prl: +qmake: FORCE + @$(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro + +qmake_all: FORCE + +dist: + @test -d .tmp/untitled11.0.0 || mkdir -p .tmp/untitled11.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/untitled11.0.0/ && $(COPY_FILE) --parents ../untitled1/qml.qrc .tmp/untitled11.0.0/ && $(COPY_FILE) --parents ../untitled1/main.cpp .tmp/untitled11.0.0/ && (cd `dirname .tmp/untitled11.0.0` && $(TAR) untitled11.0.0.tar untitled11.0.0 && $(COMPRESS) untitled11.0.0.tar) && $(MOVE) `dirname .tmp/untitled11.0.0`/untitled11.0.0.tar.gz . && $(DEL_FILE) -r .tmp/untitled11.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +check: first + +compiler_rcc_make_all: qrc_qml.cpp +compiler_rcc_clean: + -$(DEL_FILE) qrc_qml.cpp +qrc_qml.cpp: ../untitled1/qml.qrc \ + ../untitled1/main.qml + /opt/Qt/5.2.1/gcc/bin/rcc -name qml ../untitled1/qml.qrc -o qrc_qml.cpp + +compiler_moc_header_make_all: +compiler_moc_header_clean: +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: +compiler_uic_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_rcc_clean + +####### Compile + +main.o: ../untitled1/main.cpp /opt/Qt/5.2.1/gcc/include/QtWidgets/QApplication \ + /opt/Qt/5.2.1/gcc/include/QtWidgets/qapplication.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qcoreapplication.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qglobal.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qconfig.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qfeatures.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qsystemdetection.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qprocessordetection.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qcompilerdetection.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qglobalstatic.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qbasicatomic.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_bootstrap.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qgenericatomic.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_msvc.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_integrity.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qoldbasicatomic.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_vxworks.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_power.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_alpha.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv7.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv6.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv5.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_bfin.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_ia64.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_mips.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_s390.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_sh4a.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_sparc.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_x86.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_cxx11.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_gcc.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_unix.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qmutex.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qlogging.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qflags.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qtypeinfo.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qtypetraits.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qsysinfo.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qstring.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qchar.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qbytearray.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qrefcount.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qnamespace.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qarraydata.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qstringbuilder.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qobject.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qobjectdefs.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qobjectdefs_impl.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qlist.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qalgorithms.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qiterator.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qcoreevent.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qscopedpointer.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qmetatype.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qvarlengtharray.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qcontainerfwd.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qisenum.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qobject_impl.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qeventloop.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qwindowdefs.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qwindowdefs_win.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qpoint.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qsize.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qcursor.h \ + /opt/Qt/5.2.1/gcc/include/QtWidgets/qdesktopwidget.h \ + /opt/Qt/5.2.1/gcc/include/QtWidgets/qwidget.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qmargins.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qrect.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qpaintdevice.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qpalette.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qcolor.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qrgb.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qstringlist.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qdatastream.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qiodevice.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qpair.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qregexp.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qstringmatcher.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qbrush.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qvector.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qmatrix.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qpolygon.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qregion.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qline.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qtransform.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qpainterpath.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qimage.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qpixmap.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qsharedpointer.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qshareddata.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qsharedpointer_impl.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qhash.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qfont.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qfontmetrics.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qfontinfo.h \ + /opt/Qt/5.2.1/gcc/include/QtWidgets/qsizepolicy.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qkeysequence.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qevent.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qvariant.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qmap.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qdebug.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qtextstream.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qlocale.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qset.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qcontiguouscache.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qurl.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qurlquery.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qfile.h \ + /opt/Qt/5.2.1/gcc/include/QtCore/qfiledevice.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qvector2d.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qtouchdevice.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qguiapplication.h \ + /opt/Qt/5.2.1/gcc/include/QtGui/qinputmethod.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/QQmlApplicationEngine \ + /opt/Qt/5.2.1/gcc/include/QtQml/qqmlapplicationengine.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qqmlengine.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qjsengine.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qjsvalue.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qtqmlglobal.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qqmlerror.h \ + /opt/Qt/5.2.1/gcc/include/QtQml/qqmldebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../untitled1/main.cpp + +qrc_qml.o: qrc_qml.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_qml.o qrc_qml.cpp + +####### Install + +install_target: first FORCE + @test -d $(INSTALL_ROOT)/opt/untitled1/bin || mkdir -p $(INSTALL_ROOT)/opt/untitled1/bin + -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/opt/untitled1/bin/$(QMAKE_TARGET)" + +uninstall_target: FORCE + -$(DEL_FILE) "$(INSTALL_ROOT)/opt/untitled1/bin/$(QMAKE_TARGET)" + -$(DEL_DIR) $(INSTALL_ROOT)/opt/untitled1/bin/ + + +install: install_target FORCE + +uninstall: uninstall_target FORCE + +FORCE: + diff --git a/commotion_client/GUI/ui/crash_report_window.ui b/commotion_client/GUI/ui/crash_report_window.ui index 9b65804..a812a6c 100644 --- a/commotion_client/GUI/ui/crash_report_window.ui +++ b/commotion_client/GUI/ui/crash_report_window.ui @@ -17,7 +17,7 @@ Commotion Error - + :/alert32.png:/alert32.png @@ -29,7 +29,7 @@ 501 - + @@ -38,12 +38,19 @@ - :/alert48.png + :/alert48.png + + + 18 + 75 + true + + Sorry! @@ -79,7 +86,7 @@ - 6 + 4 @@ -93,7 +100,7 @@ Commotion has experienced an unknown error. - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 1 @@ -130,8 +137,14 @@ + + false + - Send a report to the commotion team. + Send a report to the Commotion team. + + + true @@ -144,7 +157,7 @@ - 1 + 0 @@ -166,6 +179,8 @@ + comment_field + @@ -218,7 +233,7 @@ 0 - + 1 @@ -249,10 +264,23 @@ - Quit Commotion + Quit + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -260,6 +288,19 @@ + + + + Qt::Horizontal + + + + 29 + 20 + + + + diff --git a/commotion_client/GUI/ui/undone/advanced_settings.ui b/commotion_client/GUI/ui/undone/advanced_settings.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/advanced_settings.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/app_settings.ui b/commotion_client/GUI/ui/undone/app_settings.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/app_settings.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/app_viewer.ui b/commotion_client/GUI/ui/undone/app_viewer.ui new file mode 100644 index 0000000..8a1261e --- /dev/null +++ b/commotion_client/GUI/ui/undone/app_viewer.ui @@ -0,0 +1,785 @@ + + + app_viewer + + + Qt::ApplicationModal + + + true + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 611 + 411 + + + + + QLayout::SetNoConstraint + + + + + + + + 18 + 75 + true + + + + Applications + + + false + + + true + + + 0 + + + + + + + + 0 + 0 + + + + + 600 + 30 + + + + + 11 + 50 + false + + + + Publicly announced applications running on this network are listed below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + BANNED + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + APPROVED + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + NEW + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + 70 + 430 + 361 + 151 + + + + + + + + + + + + + + + + + + + + + + + + + + + + restart_button + clicked() + app_viewer + close() + + + 334 + 489 + + + 412 + 14 + + + + + discard_button + clicked() + app_viewer + close() + + + 295 + 485 + + + 459 + -16 + + + + + diff --git a/commotion_client/GUI/ui/undone/application_advertiser.ui b/commotion_client/GUI/ui/undone/application_advertiser.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/application_advertiser.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/basic_settings.ui b/commotion_client/GUI/ui/undone/basic_settings.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/basic_settings.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/config_editor.ui b/commotion_client/GUI/ui/undone/config_editor.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/config_editor.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/core_extensions_menu.ui b/commotion_client/GUI/ui/undone/core_extensions_menu.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/core_extensions_menu.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/csm.ui b/commotion_client/GUI/ui/undone/csm.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/csm.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/extension_manager.ui b/commotion_client/GUI/ui/undone/extension_manager.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/extension_manager.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/extension_settings.ui b/commotion_client/GUI/ui/undone/extension_settings.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/extension_settings.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/network_status_overview.ui b/commotion_client/GUI/ui/undone/network_status_overview.ui new file mode 100644 index 0000000..8c16b8a --- /dev/null +++ b/commotion_client/GUI/ui/undone/network_status_overview.ui @@ -0,0 +1,308 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Network Status Overview + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 2 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + Page + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/network_visualizer.ui b/commotion_client/GUI/ui/undone/network_visualizer.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/network_visualizer.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/settings_menu.ui b/commotion_client/GUI/ui/undone/settings_menu.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/settings_menu.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/setup_wizard.ui b/commotion_client/GUI/ui/undone/setup_wizard.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/setup_wizard.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/undone/user_settings.ui b/commotion_client/GUI/ui/undone/user_settings.ui new file mode 100644 index 0000000..a812a6c --- /dev/null +++ b/commotion_client/GUI/ui/undone/user_settings.ui @@ -0,0 +1,346 @@ + + + crash_window + + + Qt::ApplicationModal + + + + 0 + 0 + 472 + 523 + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 451 + 501 + + + + + + + + + + + + :/alert48.png + + + + + + + + 18 + 75 + true + + + + Sorry! + + + false + + + true + + + 0 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + 4 + + + + + + 420 + 16777215 + + + + Commotion has experienced an unknown error. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 420 + 16777215 + + + + We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + false + + + Send a report to the Commotion team. + + + true + + + + + + + + 0 + 220 + + + + 0 + + + + Add a Comment + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + comment_field + + + + + View Crash Report + + + + + 20 + 10 + 391 + 161 + + + + + 391 + 16777215 + + + + + + + 130 + 50 + 160 + 80 + + + + + + + Generating Report... + + + Qt::AlignCenter + + + + + + + Qt::LeftToRight + + + QFrame::NoFrame + + + 0 + + + 1 + + + 5 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + quit_button + clicked() + crash_window + close() + + + 295 + 485 + + + 459 + -16 + + + + + restart_button + clicked() + crash_window + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/untitled/untitled.qml b/commotion_client/GUI/ui/untitled/untitled.qml new file mode 100644 index 0000000..6d2ddd8 --- /dev/null +++ b/commotion_client/GUI/ui/untitled/untitled.qml @@ -0,0 +1,19 @@ +import QtQuick 2.2 + +Rectangle { + width: 360 + height: 360 + + MouseArea { + anchors.fill: parent + onClicked: { + Qt.quit(); + } + } + + Text { + anchors.centerIn: parent + text: "Hello World" + } +} + diff --git a/commotion_client/GUI/ui/untitled/untitled.qmlproject b/commotion_client/GUI/ui/untitled/untitled.qmlproject new file mode 100644 index 0000000..6ee21c5 --- /dev/null +++ b/commotion_client/GUI/ui/untitled/untitled.qmlproject @@ -0,0 +1,20 @@ +/* File generated by Qt Creator, version 2.7.0 */ + +import QmlProject 1.1 + +Project { + mainFile: "untitled.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ "../exampleplugin" ] +} diff --git a/commotion_client/GUI/ui/untitled/untitled.qmlproject.user b/commotion_client/GUI/ui/untitled/untitled.qmlproject.user new file mode 100644 index 0000000..673491a --- /dev/null +++ b/commotion_client/GUI/ui/untitled/untitled.qmlproject.user @@ -0,0 +1,66 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + -1 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.TargetCount + 0 + + + ProjectExplorer.Project.Updater.EnvironmentId + {778eb0d1-91e8-4c9f-8826-260a5cc73d96} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/commotion_client/GUI/ui/untitled1/deployment.pri b/commotion_client/GUI/ui/untitled1/deployment.pri new file mode 100644 index 0000000..5441b63 --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/deployment.pri @@ -0,0 +1,27 @@ +android-no-sdk { + target.path = /data/user/qt + export(target.path) + INSTALLS += target +} else:android { + x86 { + target.path = /libs/x86 + } else: armeabi-v7a { + target.path = /libs/armeabi-v7a + } else { + target.path = /libs/armeabi + } + export(target.path) + INSTALLS += target +} else:unix { + isEmpty(target.path) { + qnx { + target.path = /tmp/$${TARGET}/bin + } else { + target.path = /opt/$${TARGET}/bin + } + export(target.path) + } + INSTALLS += target +} + +export(INSTALLS) diff --git a/commotion_client/GUI/ui/untitled1/main.cpp b/commotion_client/GUI/ui/untitled1/main.cpp new file mode 100644 index 0000000..a22e2e8 --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/main.cpp @@ -0,0 +1,12 @@ +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); + + return app.exec(); +} diff --git a/commotion_client/GUI/ui/untitled1/main.qml b/commotion_client/GUI/ui/untitled1/main.qml new file mode 100644 index 0000000..4187749 --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/main.qml @@ -0,0 +1,24 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.1 + +ApplicationWindow { + visible: true + width: 640 + height: 480 + title: qsTr("Hello World") + + menuBar: MenuBar { + Menu { + title: qsTr("File") + MenuItem { + text: qsTr("Exit") + onTriggered: Qt.quit(); + } + } + } + + Text { + text: qsTr("Hello World") + anchors.centerIn: parent + } +} diff --git a/commotion_client/GUI/ui/untitled1/qml.qrc b/commotion_client/GUI/ui/untitled1/qml.qrc new file mode 100644 index 0000000..5f6483a --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/qml.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/commotion_client/GUI/ui/untitled1/untitled1.pro b/commotion_client/GUI/ui/untitled1/untitled1.pro new file mode 100644 index 0000000..1cdc565 --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/untitled1.pro @@ -0,0 +1,13 @@ +TEMPLATE = app + +QT += qml quick widgets + +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Default rules for deployment. +include(deployment.pri) diff --git a/commotion_client/GUI/ui/untitled1/untitled1.pro.user b/commotion_client/GUI/ui/untitled1/untitled1.pro.user new file mode 100644 index 0000000..e398484 --- /dev/null +++ b/commotion_client/GUI/ui/untitled1/untitled1.pro.user @@ -0,0 +1,251 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.2.1 GCC 32bit + Desktop Qt 5.2.1 GCC 32bit + qt.521.gcc.essentials_kit + 0 + 0 + 0 + + /home/griffin/commotion-client/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/griffin/commotion-client/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + untitled1 + + Qt4ProjectManager.Qt4RunConfiguration:/home/griffin/commotion-client/commotion_client/GUI/ui/untitled1/untitled1.pro + + untitled1.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {778eb0d1-91e8-4c9f-8826-260a5cc73d96} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + From 7440ec71240bc6a50144a12915dbf5aa13ee2614 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 07:46:41 -0400 Subject: [PATCH 2/9] update --- .../GUI/ui/undone/advanced_settings.ui | 346 -------- .../GUI/ui/undone/app_settings.ui | 346 -------- commotion_client/GUI/ui/undone/app_viewer.ui | 785 ------------------ .../GUI/ui/undone/application_advertiser.ui | 346 -------- .../GUI/ui/undone/basic_settings.ui | 346 -------- .../GUI/ui/undone/config_editor.ui | 346 -------- .../GUI/ui/undone/core_extensions_menu.ui | 346 -------- commotion_client/GUI/ui/undone/csm.ui | 346 -------- .../GUI/ui/undone/extension_manager.ui | 346 -------- .../GUI/ui/undone/extension_settings.ui | 346 -------- .../GUI/ui/undone/network_status_overview.ui | 308 ------- .../GUI/ui/undone/network_visualizer.ui | 346 -------- .../GUI/ui/undone/settings_menu.ui | 346 -------- .../GUI/ui/undone/setup_wizard.ui | 346 -------- .../GUI/ui/undone/user_settings.ui | 346 -------- 15 files changed, 5591 deletions(-) delete mode 100644 commotion_client/GUI/ui/undone/advanced_settings.ui delete mode 100644 commotion_client/GUI/ui/undone/app_settings.ui delete mode 100644 commotion_client/GUI/ui/undone/app_viewer.ui delete mode 100644 commotion_client/GUI/ui/undone/application_advertiser.ui delete mode 100644 commotion_client/GUI/ui/undone/basic_settings.ui delete mode 100644 commotion_client/GUI/ui/undone/config_editor.ui delete mode 100644 commotion_client/GUI/ui/undone/core_extensions_menu.ui delete mode 100644 commotion_client/GUI/ui/undone/csm.ui delete mode 100644 commotion_client/GUI/ui/undone/extension_manager.ui delete mode 100644 commotion_client/GUI/ui/undone/extension_settings.ui delete mode 100644 commotion_client/GUI/ui/undone/network_status_overview.ui delete mode 100644 commotion_client/GUI/ui/undone/network_visualizer.ui delete mode 100644 commotion_client/GUI/ui/undone/settings_menu.ui delete mode 100644 commotion_client/GUI/ui/undone/setup_wizard.ui delete mode 100644 commotion_client/GUI/ui/undone/user_settings.ui diff --git a/commotion_client/GUI/ui/undone/advanced_settings.ui b/commotion_client/GUI/ui/undone/advanced_settings.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/advanced_settings.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/app_settings.ui b/commotion_client/GUI/ui/undone/app_settings.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/app_settings.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/app_viewer.ui b/commotion_client/GUI/ui/undone/app_viewer.ui deleted file mode 100644 index 8a1261e..0000000 --- a/commotion_client/GUI/ui/undone/app_viewer.ui +++ /dev/null @@ -1,785 +0,0 @@ - - - app_viewer - - - Qt::ApplicationModal - - - true - - - - 0 - 0 - 640 - 600 - - - - - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 242 - 62 - 197 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 242 - 62 - 197 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 242 - 62 - 197 - - - - - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 611 - 411 - - - - - QLayout::SetNoConstraint - - - - - - - - 18 - 75 - true - - - - Applications - - - false - - - true - - - 0 - - - - - - - - 0 - 0 - - - - - 600 - 30 - - - - - 11 - 50 - false - - - - Publicly announced applications running on this network are listed below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - QLayout::SetNoConstraint - - - - - - 600 - 20 - - - - - 13 - 75 - true - - - - BANNED - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - QFrame::Plain - - - Qt::Horizontal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QLayout::SetNoConstraint - - - - - - 600 - 20 - - - - - 13 - 75 - true - - - - APPROVED - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - QFrame::Plain - - - Qt::Horizontal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QLayout::SetNoConstraint - - - - - - 600 - 20 - - - - - 13 - 75 - true - - - - NEW - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 104 - 226 - - - - - - - - QFrame::Plain - - - Qt::Horizontal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QLayout::SetNoConstraint - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - 70 - 430 - 361 - 151 - - - - - - - - - - - - - - - - - - - - - - - - - - - - restart_button - clicked() - app_viewer - close() - - - 334 - 489 - - - 412 - 14 - - - - - discard_button - clicked() - app_viewer - close() - - - 295 - 485 - - - 459 - -16 - - - - - diff --git a/commotion_client/GUI/ui/undone/application_advertiser.ui b/commotion_client/GUI/ui/undone/application_advertiser.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/application_advertiser.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/basic_settings.ui b/commotion_client/GUI/ui/undone/basic_settings.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/basic_settings.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/config_editor.ui b/commotion_client/GUI/ui/undone/config_editor.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/config_editor.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/core_extensions_menu.ui b/commotion_client/GUI/ui/undone/core_extensions_menu.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/core_extensions_menu.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/csm.ui b/commotion_client/GUI/ui/undone/csm.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/csm.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/extension_manager.ui b/commotion_client/GUI/ui/undone/extension_manager.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/extension_manager.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/extension_settings.ui b/commotion_client/GUI/ui/undone/extension_settings.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/extension_settings.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/network_status_overview.ui b/commotion_client/GUI/ui/undone/network_status_overview.ui deleted file mode 100644 index 8c16b8a..0000000 --- a/commotion_client/GUI/ui/undone/network_status_overview.ui +++ /dev/null @@ -1,308 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 640 - 600 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Network Status Overview - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 2 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - Page - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/network_visualizer.ui b/commotion_client/GUI/ui/undone/network_visualizer.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/network_visualizer.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/settings_menu.ui b/commotion_client/GUI/ui/undone/settings_menu.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/settings_menu.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/setup_wizard.ui b/commotion_client/GUI/ui/undone/setup_wizard.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/setup_wizard.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - diff --git a/commotion_client/GUI/ui/undone/user_settings.ui b/commotion_client/GUI/ui/undone/user_settings.ui deleted file mode 100644 index a812a6c..0000000 --- a/commotion_client/GUI/ui/undone/user_settings.ui +++ /dev/null @@ -1,346 +0,0 @@ - - - crash_window - - - Qt::ApplicationModal - - - - 0 - 0 - 472 - 523 - - - - Commotion Error - - - - :/alert32.png:/alert32.png - - - - - 10 - 10 - 451 - 501 - - - - - - - - - - - - :/alert48.png - - - - - - - - 18 - 75 - true - - - - Sorry! - - - false - - - true - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - - - - - 4 - - - - - - 420 - 16777215 - - - - Commotion has experienced an unknown error. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - - - - - - - - - - 420 - 16777215 - - - - We have created a crash report to allow the Commotion team to identify and address this problem. If you would be willing to be contated directly please include your e-mail in the comment section below. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - 1 - - - - - - - - - false - - - Send a report to the Commotion team. - - - true - - - - - - - - 0 - 220 - - - - 0 - - - - Add a Comment - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - comment_field - - - - - View Crash Report - - - - - 20 - 10 - 391 - 161 - - - - - 391 - 16777215 - - - - - - - 130 - 50 - 160 - 80 - - - - - - - Generating Report... - - - Qt::AlignCenter - - - - - - - Qt::LeftToRight - - - QFrame::NoFrame - - - 0 - - - 1 - - - 5 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Quit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Restart Commotion - - - - - - - Qt::Horizontal - - - - 29 - 20 - - - - - - - - - - - - - - - quit_button - clicked() - crash_window - close() - - - 295 - 485 - - - 459 - -16 - - - - - restart_button - clicked() - crash_window - close() - - - 334 - 489 - - - 412 - 14 - - - - - From a1ea1353a75f28c4f1e2f08c214aee20d756c4ec Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 08:14:30 -0400 Subject: [PATCH 3/9] uis that need code --- .../GUI/ui/needs_code/app_settings.ui | 541 +++++++++++++ .../GUI/ui/needs_code/app_viewer.ui | 757 ++++++++++++++++++ .../ui/needs_code/network_status_overview.ui | 549 +++++++++++++ 3 files changed, 1847 insertions(+) create mode 100644 commotion_client/GUI/ui/needs_code/app_settings.ui create mode 100644 commotion_client/GUI/ui/needs_code/app_viewer.ui create mode 100644 commotion_client/GUI/ui/needs_code/network_status_overview.ui diff --git a/commotion_client/GUI/ui/needs_code/app_settings.ui b/commotion_client/GUI/ui/needs_code/app_settings.ui new file mode 100644 index 0000000..bbea20c --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/app_settings.ui @@ -0,0 +1,541 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 20 + 450 + 541 + 26 + + + + Automatically approve all publicly announced applications on this network + + + + + + 20 + 470 + 541 + 26 + + + + Periodically check connection to announced applications on this network + + + + + + 20 + 490 + 541 + 26 + + + + Allow users to add application announcements from your access point + + + + + + 11 + 68 + 85 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Categories + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Application Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + Change settings for applications publicly hosted by this server. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 100 + 381 + 140 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + SETTINGS + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + + + + + + + + 20 + 260 + 506 + 59 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Force local applications to expire? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + 600 + 16777215 + + + + false + + + When checked, all applications expire after a time period you specify. + + + true + + + + + + + + + 20 + 330 + 381 + 102 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Time before applications expire + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + seconds + + + + + minutes + + + + + hours + + + + + days + + + + + + + line + verticalLayoutWidget + cat1_box + report_info_3 + cat1_box_2 + cat1_box_3 + expiry_time + expiry_time_text + auto_approve_apps + check_apps + check_apps_2 + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/needs_code/app_viewer.ui b/commotion_client/GUI/ui/needs_code/app_viewer.ui new file mode 100644 index 0000000..121f43d --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/app_viewer.ui @@ -0,0 +1,757 @@ + + + app_viewer + + + Qt::ApplicationModal + + + true + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 242 + 62 + 197 + + + + + + + + Commotion Error + + + + :/alert32.png:/alert32.png + + + + + 10 + 10 + 611 + 411 + + + + + QLayout::SetNoConstraint + + + + + + + + 18 + 75 + true + + + + Applications + + + false + + + true + + + 0 + + + + + + + + 0 + 0 + + + + + 600 + 30 + + + + + 11 + 50 + false + + + + Publicly announced applications running on this network are listed below. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + BANNED + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + APPROVED + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + + 600 + 20 + + + + + 13 + 75 + true + + + + NEW + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 104 + 226 + + + + + + + + QFrame::Plain + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + QLayout::SetNoConstraint + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restart Commotion + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + + + + + + restart_button + clicked() + app_viewer + close() + + + 334 + 489 + + + 412 + 14 + + + + + discard_button + clicked() + app_viewer + close() + + + 295 + 485 + + + 459 + -16 + + + + + diff --git a/commotion_client/GUI/ui/needs_code/network_status_overview.ui b/commotion_client/GUI/ui/needs_code/network_status_overview.ui new file mode 100644 index 0000000..c23e117 --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/network_status_overview.ui @@ -0,0 +1,549 @@ + + + network_status_overview + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Network Status Overview + + + false + + + + + + false + + + + + 10 + 10 + 602 + 545 + + + + + + + 2 + + + QLayout::SetMinAndMaxSize + + + + + + 0 + 0 + + + + + 350 + 139 + + + + + 600 + 139 + + + + + 18 + 75 + true + + + + Network Status Overview + + + false + + + true + + + 0 + + + + + + + + + + + + 600 + 16777215 + + + + Providing Gateway? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + + 200 + 16777215 + + + + + + + commotionAP + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + 600 + 16777215 + + + + + 75 + true + + + + (On) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + + 200 + 16777215 + + + + + + + commotionMesh + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + 600 + 16777215 + + + + + 75 + true + + + + (On) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + 600 + 300 + + + + 0 + + + false + + + false + + + false + + + + Nearby Mesh Devices + + + + + 10 + 10 + 571 + 191 + + + + + + + 10 + 210 + 61 + 31 + + + + + 600 + 16777215 + + + + + 12 + 75 + true + + + + Legend: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 80 + 210 + 91 + 23 + + + + + 200 + 16777215 + + + + + 12 + + + + + + + Very Good + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + Mesh Visualizer + + + + + 10 + 30 + 581 + 221 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + 0 + 0 + 600 + 26 + + + + + + + + 200 + 16777215 + + + + + 12 + 75 + true + + + + + + + Gateway Node + + + Qt::AlignHCenter|Qt::AlignTop + + + true + + + 1 + + + + + + + + 200 + 16777215 + + + + + 12 + 75 + true + + + + + + + Basic Node + + + Qt::AlignHCenter|Qt::AlignTop + + + true + + + 1 + + + + + + + + + Connected Clients + + + + + 10 + 10 + 571 + 241 + + + + + + + Debug Report + + + + true + + + + 10 + 10 + 571 + 161 + + + + + 600 + 16777215 + + + + + + + + + + + + + + From 06127b0a0e23ecdaae837a67745e86dfcb9463d0 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 08:45:56 -0400 Subject: [PATCH 4/9] app_advertiser --- .../ui/needs_code/application_advertiser.ui | 1014 +++++++++++++++++ 1 file changed, 1014 insertions(+) create mode 100644 commotion_client/GUI/ui/needs_code/application_advertiser.ui diff --git a/commotion_client/GUI/ui/needs_code/application_advertiser.ui b/commotion_client/GUI/ui/needs_code/application_advertiser.ui new file mode 100644 index 0000000..7b8380c --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/application_advertiser.ui @@ -0,0 +1,1014 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 880 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 20 + 410 + 541 + 26 + + + + Community + + + + + + 20 + 430 + 541 + 26 + + + + Collaboration + + + + + + 20 + 450 + 541 + 26 + + + + Fun + + + + + + 20 + 50 + 151 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Application Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Add an Application + + + false + + + true + + + 0 + + + + + + 0 + 840 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 80 + 491 + 32 + + + + + + + 20 + 110 + 291 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is how your application will be displayed. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 84 + + + + + + + 20 + 140 + 379 + 30 + + + + + 600 + 30 + + + + + 75 + true + + + + Description + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 260 + 391 + 41 + + + + + 600 + 45 + + + + + 10 + 50 + false + false + + + + The description should include a one paragraph summary of the application and any other relevant information. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 330 + 491 + 32 + + + + + + + + + + 20 + 300 + 241 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + IP Address or URL of Service + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 360 + 391 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + IP address or URL where the application can be reached. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 390 + 241 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Type of Application + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 500 + 241 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Application Icon + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 560 + 561 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + + + + This should be a URL of an image file that will be displayed next to your application description + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 530 + 491 + 32 + + + + + + + + + + 20 + 470 + 481 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + Choose any relevant categories that describe your application. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 590 + 121 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Port of service + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 650 + 391 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + If no port is given, it will default to port 80. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 620 + 491 + 32 + + + + + + + 80 + + + + + + 140 + 590 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 400 + 680 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 710 + 491 + 32 + + + + + + + false + + + 5 + + + + + + 20 + 680 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 740 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + How many nodes away your application will be seen. Defaults to 5 hops away. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 790 + 541 + 26 + + + + If checked, this application will not expire automatically. + + + true + + + + + + 20 + 770 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Is this application permanent? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + appname_head + add_app_head + layoutWidget + app_community + app_collab + app_fun + app_name + appname_descriptor + app_description_text + app_description_head + appdesc_descriptor + app_address + app_address_head + appurl_descriptor + app_category_head + app_icon_head + appicon_descriptor + app_icon + app_descriptor_3 + app_port_head + appport_descriptor + app_address_2 + optional1 + optional2 + app_address_3 + app_hops_head + appname_descriptor_4 + app_perm + app_hops_head_2 + + + app_name + app_description_text + app_address + app_community + app_collab + app_fun + app_icon + app_address_2 + app_address_3 + app_perm + discard_button + save_button + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + From df207693899108b91995671d1e7db13bd43f3f08 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 08:48:19 -0400 Subject: [PATCH 5/9] tab order --- .../GUI/ui/needs_code/app_settings.ui | 35 +++++++++++++------ .../ui/needs_code/network_status_overview.ui | 8 ++++- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/commotion_client/GUI/ui/needs_code/app_settings.ui b/commotion_client/GUI/ui/needs_code/app_settings.ui index bbea20c..32659b0 100644 --- a/commotion_client/GUI/ui/needs_code/app_settings.ui +++ b/commotion_client/GUI/ui/needs_code/app_settings.ui @@ -243,7 +243,7 @@ 1 - + 5 @@ -314,7 +314,7 @@ - + 20 @@ -363,7 +363,7 @@ - + 20 @@ -422,7 +422,7 @@ - + 20 @@ -489,18 +489,31 @@ + categories_head + sorry_label + error_text + layoutWidget + layoutWidget + layoutWidget + layoutWidget line - verticalLayoutWidget - cat1_box - report_info_3 - cat1_box_2 - cat1_box_3 - expiry_time - expiry_time_text auto_approve_apps check_apps check_apps_2 + + cat1_box + cat1_box_2 + cat1_box_3 + force_expire_box + expiry_time + time_type + auto_approve_apps + check_apps + check_apps_2 + discard_button + save_button + diff --git a/commotion_client/GUI/ui/needs_code/network_status_overview.ui b/commotion_client/GUI/ui/needs_code/network_status_overview.ui index c23e117..b96230a 100644 --- a/commotion_client/GUI/ui/needs_code/network_status_overview.ui +++ b/commotion_client/GUI/ui/needs_code/network_status_overview.ui @@ -304,7 +304,7 @@ - 0 + 1 false @@ -542,6 +542,12 @@ + + network_status_tabs + nearby_mesh_devices + connected_clients_table + debug_report_text + From d938d482763487956c5120a66863f5e480249598 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 09:25:58 -0400 Subject: [PATCH 6/9] basic_settings.ui --- .../GUI/ui/needs_code/basic_settings.ui | 634 ++++++++++++++++++ 1 file changed, 634 insertions(+) create mode 100644 commotion_client/GUI/ui/needs_code/basic_settings.ui diff --git a/commotion_client/GUI/ui/needs_code/basic_settings.ui b/commotion_client/GUI/ui/needs_code/basic_settings.ui new file mode 100644 index 0000000..ce987c4 --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/basic_settings.ui @@ -0,0 +1,634 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 260 + 630 + 20 + + + + Qt::Horizontal + + + + + + 20 + 120 + 121 + 21 + + + + + 600 + 30 + + + + + 75 + true + + + + Node Name + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Node Settings + + + false + + + true + + + 0 + + + + + + 10 + 40 + 581 + 71 + + + + + 600 + 200 + + + + + 11 + + + + In this section you'l set the basic required settings for this device, and the basic network settings required to connect this device to a Commotion mesh network. You will be prompted to save your settings along the way and apply them at the end. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 140 + 441 + 31 + + + + This is visible to other devices and users on the network. + + + 3 + + + + + + 20 + 170 + 451 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + The node name (hostname) is a unique name for this device. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 250 + 401 + 30 + + + + + 600 + 30 + + + + + 75 + true + + + + CURRENT NODE ADMINISTRATION PASSWORD + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 0 + 360 + 630 + 20 + + + + Qt::Horizontal + + + + + + 20 + 350 + 401 + 30 + + + + + 600 + 30 + + + + + 75 + true + + + + NEW ADMINISTRATION PASSWORD + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 210 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Password Settings + + + false + + + true + + + 0 + + + + + + 20 + 310 + 551 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + The current node administration password is required to change the administration password. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 280 + 441 + 31 + + + + This is visible to other devices and users on the network. + + + 3 + + + + + + 20 + 410 + 441 + 31 + + + + This is visible to other devices and users on the network. + + + 3 + + + New Password + + + + + + 20 + 460 + 441 + 31 + + + + This is visible to other devices and users on the network. + + + 3 + + + Confirm New Password + + + + + + 20 + 380 + 451 + 24 + + + + + 600 + 30 + + + + + 12 + 50 + false + false + + + + This password is used to make changes to this device. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + node_name_head + basic_config_head + basic_config_intro_text + layoutWidget + line + nodename + nodename_descriptor + current_node_pw_head + line_2 + current_node_pw_head_2 + basic_config_head_2 + node_pw_change_text + node_pw + node_pw_change1 + node_pw_change2 + node_pw_change_text_2 + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + From b81f061c567c33fab3713b5e452745eddae28f2e Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 10:17:36 -0400 Subject: [PATCH 7/9] user_security_settings.ui --- .../ui/needs_code/user_settngs_security.ui | 496 ++++++++++++++++++ 1 file changed, 496 insertions(+) create mode 100644 commotion_client/GUI/ui/needs_code/user_settngs_security.ui diff --git a/commotion_client/GUI/ui/needs_code/user_settngs_security.ui b/commotion_client/GUI/ui/needs_code/user_settngs_security.ui new file mode 100644 index 0000000..55f1cee --- /dev/null +++ b/commotion_client/GUI/ui/needs_code/user_settngs_security.ui @@ -0,0 +1,496 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Security Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + Change the security settings for this server. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 11 + 78 + 85 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Firewall + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 0 + 90 + 630 + 20 + + + + Qt::Horizontal + + + + + + 10 + 160 + 611 + 381 + + + + 1 + + + + IPv4 Firewall + + + + + 480 + 0 + 121 + 31 + + + + Reset Counters + + + + + + 320 + 0 + 131 + 31 + + + + Restart Firewall + + + + + + 10 + 50 + 591 + 61 + + + + + + + 10 + 120 + 591 + 61 + + + + + + + 10 + 190 + 591 + 61 + + + + + + + 10 + 260 + 591 + 61 + + + + + + + Ipv6 Firewall + + + + + 480 + 0 + 121 + 31 + + + + Reset Counters + + + + + + 320 + 0 + 131 + 31 + + + + Restart Firewall + + + + + + 10 + 40 + 591 + 61 + + + + + + + 10 + 180 + 591 + 61 + + + + + + + 10 + 110 + 591 + 61 + + + + + + + 10 + 250 + 591 + 61 + + + + + + + + + 10 + 100 + 438 + 24 + + + + + 600 + 25 + + + + Change the firewall rules. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + From b2bb161bed5e9397c9c04898332b08b484a9df82 Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 11:42:14 -0400 Subject: [PATCH 8/9] added unfinished items --- .../GUI/ui/needs_code/app_viewer.ui | 4 +- .../ui/needs_code/application_advertiser.ui | 22 +- .../GUI/ui/needs_code/basic_settings.ui | 8 +- .../ui/needs_code/network_status_overview.ui | 2 +- .../ui/needs_code/user_settngs_security.ui | 8 +- .../GUI/ui/unfinished/advanced_status.ui | 541 ++++++++++++++++++ .../GUI/ui/unfinished/advanced_system.ui | 541 ++++++++++++++++++ commotion_client/GUI/ui/unfinished/base.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/config_editor.ui | 500 ++++++++++++++++ commotion_client/GUI/ui/unfinished/csm.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/extension_manager.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/extension_settings.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/network_visualizer.ui | 342 +++++++++++ .../GUI/ui/unfinished/settings_menu.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/setup_wizard.ui | 500 ++++++++++++++++ .../GUI/ui/unfinished/user_settings.ui | 500 ++++++++++++++++ 16 files changed, 5446 insertions(+), 22 deletions(-) create mode 100644 commotion_client/GUI/ui/unfinished/advanced_status.ui create mode 100644 commotion_client/GUI/ui/unfinished/advanced_system.ui create mode 100644 commotion_client/GUI/ui/unfinished/base.ui create mode 100644 commotion_client/GUI/ui/unfinished/config_editor.ui create mode 100644 commotion_client/GUI/ui/unfinished/csm.ui create mode 100644 commotion_client/GUI/ui/unfinished/extension_manager.ui create mode 100644 commotion_client/GUI/ui/unfinished/extension_settings.ui create mode 100644 commotion_client/GUI/ui/unfinished/network_visualizer.ui create mode 100644 commotion_client/GUI/ui/unfinished/settings_menu.ui create mode 100644 commotion_client/GUI/ui/unfinished/setup_wizard.ui create mode 100644 commotion_client/GUI/ui/unfinished/user_settings.ui diff --git a/commotion_client/GUI/ui/needs_code/app_viewer.ui b/commotion_client/GUI/ui/needs_code/app_viewer.ui index 121f43d..448adda 100644 --- a/commotion_client/GUI/ui/needs_code/app_viewer.ui +++ b/commotion_client/GUI/ui/needs_code/app_viewer.ui @@ -136,7 +136,7 @@ - + 18 @@ -718,7 +718,7 @@ - + diff --git a/commotion_client/GUI/ui/needs_code/application_advertiser.ui b/commotion_client/GUI/ui/needs_code/application_advertiser.ui index 7b8380c..8004dad 100644 --- a/commotion_client/GUI/ui/needs_code/application_advertiser.ui +++ b/commotion_client/GUI/ui/needs_code/application_advertiser.ui @@ -1,7 +1,7 @@ - app_settings - + add_app + Qt::ApplicationModal @@ -791,7 +791,7 @@ 1 - + 20 @@ -844,7 +844,7 @@ 1 - + 20 @@ -896,7 +896,7 @@ true - + 20 @@ -954,11 +954,11 @@ app_address_2 optional1 optional2 - app_address_3 + app_hops app_hops_head - appname_descriptor_4 + apphops_info app_perm - app_hops_head_2 + app_perm_head app_name @@ -969,7 +969,7 @@ app_fun app_icon app_address_2 - app_address_3 + app_hops app_perm discard_button save_button @@ -981,7 +981,7 @@ discard_button clicked() - app_settings + add_app close() @@ -997,7 +997,7 @@ save_button clicked() - app_settings + add_app close() diff --git a/commotion_client/GUI/ui/needs_code/basic_settings.ui b/commotion_client/GUI/ui/needs_code/basic_settings.ui index ce987c4..85c73b6 100644 --- a/commotion_client/GUI/ui/needs_code/basic_settings.ui +++ b/commotion_client/GUI/ui/needs_code/basic_settings.ui @@ -1,7 +1,7 @@ - app_settings - + node_settings + Qt::ApplicationModal @@ -601,7 +601,7 @@ discard_button clicked() - app_settings + node_settings close() @@ -617,7 +617,7 @@ save_button clicked() - app_settings + node_settings close() diff --git a/commotion_client/GUI/ui/needs_code/network_status_overview.ui b/commotion_client/GUI/ui/needs_code/network_status_overview.ui index b96230a..52a3b26 100644 --- a/commotion_client/GUI/ui/needs_code/network_status_overview.ui +++ b/commotion_client/GUI/ui/needs_code/network_status_overview.ui @@ -113,7 +113,7 @@ QLayout::SetMinAndMaxSize - + 0 diff --git a/commotion_client/GUI/ui/needs_code/user_settngs_security.ui b/commotion_client/GUI/ui/needs_code/user_settngs_security.ui index 55f1cee..a3ee264 100644 --- a/commotion_client/GUI/ui/needs_code/user_settngs_security.ui +++ b/commotion_client/GUI/ui/needs_code/user_settngs_security.ui @@ -1,7 +1,7 @@ - app_settings - + user_security_settings + Qt::ApplicationModal @@ -463,7 +463,7 @@ discard_button clicked() - app_settings + user_security_settings close() @@ -479,7 +479,7 @@ save_button clicked() - app_settings + user_security_settings close() diff --git a/commotion_client/GUI/ui/unfinished/advanced_status.ui b/commotion_client/GUI/ui/unfinished/advanced_status.ui new file mode 100644 index 0000000..bbea20c --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/advanced_status.ui @@ -0,0 +1,541 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 20 + 450 + 541 + 26 + + + + Automatically approve all publicly announced applications on this network + + + + + + 20 + 470 + 541 + 26 + + + + Periodically check connection to announced applications on this network + + + + + + 20 + 490 + 541 + 26 + + + + Allow users to add application announcements from your access point + + + + + + 11 + 68 + 85 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Categories + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Application Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + Change settings for applications publicly hosted by this server. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 100 + 381 + 140 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + SETTINGS + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + + + + + + + + 20 + 260 + 506 + 59 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Force local applications to expire? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + 600 + 16777215 + + + + false + + + When checked, all applications expire after a time period you specify. + + + true + + + + + + + + + 20 + 330 + 381 + 102 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Time before applications expire + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + seconds + + + + + minutes + + + + + hours + + + + + days + + + + + + + line + verticalLayoutWidget + cat1_box + report_info_3 + cat1_box_2 + cat1_box_3 + expiry_time + expiry_time_text + auto_approve_apps + check_apps + check_apps_2 + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/advanced_system.ui b/commotion_client/GUI/ui/unfinished/advanced_system.ui new file mode 100644 index 0000000..bbea20c --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/advanced_system.ui @@ -0,0 +1,541 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 20 + 450 + 541 + 26 + + + + Automatically approve all publicly announced applications on this network + + + + + + 20 + 470 + 541 + 26 + + + + Periodically check connection to announced applications on this network + + + + + + 20 + 490 + 541 + 26 + + + + Allow users to add application announcements from your access point + + + + + + 11 + 68 + 85 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Categories + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Application Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + Change settings for applications publicly hosted by this server. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 100 + 381 + 140 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + SETTINGS + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + + + + + + + + 20 + 260 + 506 + 59 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Force local applications to expire? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + 600 + 16777215 + + + + false + + + When checked, all applications expire after a time period you specify. + + + true + + + + + + + + + 20 + 330 + 381 + 102 + + + + + + + + 600 + 30 + + + + + 75 + true + + + + Time before applications expire + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + + + + + + seconds + + + + + minutes + + + + + hours + + + + + days + + + + + + + line + verticalLayoutWidget + cat1_box + report_info_3 + cat1_box_2 + cat1_box_3 + expiry_time + expiry_time_text + auto_approve_apps + check_apps + check_apps_2 + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/base.ui b/commotion_client/GUI/ui/unfinished/base.ui new file mode 100644 index 0000000..3501c3f --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/base.ui @@ -0,0 +1,500 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Title + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + _head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/config_editor.ui b/commotion_client/GUI/ui/unfinished/config_editor.ui new file mode 100644 index 0000000..0fdb1b6 --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/config_editor.ui @@ -0,0 +1,500 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Config Editor + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + config_editor_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/csm.ui b/commotion_client/GUI/ui/unfinished/csm.ui new file mode 100644 index 0000000..85951b8 --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/csm.ui @@ -0,0 +1,500 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Commotion Service Manager + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + csm_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/extension_manager.ui b/commotion_client/GUI/ui/unfinished/extension_manager.ui new file mode 100644 index 0000000..78e381b --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/extension_manager.ui @@ -0,0 +1,500 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Extension Manager + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + extension_manager_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/extension_settings.ui b/commotion_client/GUI/ui/unfinished/extension_settings.ui new file mode 100644 index 0000000..c6c565d --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/extension_settings.ui @@ -0,0 +1,500 @@ + + + app_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Extension Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + extension_settings_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + app_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + app_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/network_visualizer.ui b/commotion_client/GUI/ui/unfinished/network_visualizer.ui new file mode 100644 index 0000000..3136463 --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/network_visualizer.ui @@ -0,0 +1,342 @@ + + + network_visualizer + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Network Visualizer + + + false + + + true + + + 0 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 30 + 510 + 191 + 26 + + + + Automatically adjust + + + true + + + + + + 300 + 510 + 91 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + Gateway node + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 440 + 510 + 91 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + Basic node + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 40 + 70 + 551 + 391 + + + + + + + + + + discard_button + clicked() + network_visualizer + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + network_visualizer + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/settings_menu.ui b/commotion_client/GUI/ui/unfinished/settings_menu.ui new file mode 100644 index 0000000..ea8d037 --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/settings_menu.ui @@ -0,0 +1,500 @@ + + + settings_menu + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Settings Menu + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + Wait, is this in addition to other settings menus? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + settings_menu_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + settings_menu + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + settings_menu + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/setup_wizard.ui b/commotion_client/GUI/ui/unfinished/setup_wizard.ui new file mode 100644 index 0000000..b1073ce --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/setup_wizard.ui @@ -0,0 +1,500 @@ + + + setup_wizard + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + Setup Wizard + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + setup_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + setup_wizard + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + setup_wizard + close() + + + 334 + 489 + + + 412 + 14 + + + + + diff --git a/commotion_client/GUI/ui/unfinished/user_settings.ui b/commotion_client/GUI/ui/unfinished/user_settings.ui new file mode 100644 index 0000000..3afc9c1 --- /dev/null +++ b/commotion_client/GUI/ui/unfinished/user_settings.ui @@ -0,0 +1,500 @@ + + + user_settings + + + Qt::ApplicationModal + + + + 0 + 0 + 640 + 600 + + + + + 0 + 0 + + + + + 640 + 16777215 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 12 + + + + Commotion Error + + + + + 0 + 80 + 630 + 20 + + + + Qt::Horizontal + + + + + + 11 + 68 + 141 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Section Header + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 11 + 11 + 600 + 30 + + + + + 600 + 30 + + + + + 18 + 75 + true + + + + User Settings + + + false + + + true + + + 0 + + + + + + 11 + 42 + 438 + 24 + + + + + 600 + 25 + + + + This is some intro text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + + + + 5 + 560 + 631 + 34 + + + + + QLayout::SetMinAndMaxSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Discard Changes + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Save Changes + + + + + + + Qt::Horizontal + + + + 29 + 20 + + + + + + + + + + 20 + 200 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Wait, is this a question or? + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 220 + 541 + 26 + + + + Perhaps. + + + true + + + + + + 400 + 110 + 121 + 24 + + + + + 600 + 30 + + + + + 50 + false + + + + (optional) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 170 + 491 + 24 + + + + + 600 + 30 + + + + + 10 + 50 + false + false + + + + This is some basic info about this box. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 110 + 381 + 24 + + + + + 600 + 30 + + + + + 75 + true + + + + Number of hops away this service should be seen + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + 1 + + + + + + 20 + 140 + 491 + 32 + + + + + + + false + + + 5 + + + section_head + user_settings_head + _intro_text + layoutWidget + line + subsection2 + app_perm + optional2 + info_descriptor + app_hops_head + text_entry + + + + + + + discard_button + clicked() + user_settings + close() + + + 295 + 485 + + + 459 + -16 + + + + + save_button + clicked() + user_settings + close() + + + 334 + 489 + + + 412 + 14 + + + + + From 3dccf0b5576ddfae11a096958de91b41ce94441d Mon Sep 17 00:00:00 2001 From: Griffin Boyce Date: Mon, 28 Apr 2014 11:52:17 -0400 Subject: [PATCH 9/9] herped a derp --- .../Makefile | 613 ------------------ commotion_client/GUI/ui/untitled/untitled.qml | 19 - .../GUI/ui/untitled/untitled.qmlproject | 20 - .../GUI/ui/untitled/untitled.qmlproject.user | 66 -- .../GUI/ui/untitled1/deployment.pri | 27 - commotion_client/GUI/ui/untitled1/main.cpp | 12 - commotion_client/GUI/ui/untitled1/main.qml | 24 - commotion_client/GUI/ui/untitled1/qml.qrc | 5 - .../GUI/ui/untitled1/untitled1.pro | 13 - .../GUI/ui/untitled1/untitled1.pro.user | 251 ------- 10 files changed, 1050 deletions(-) delete mode 100644 commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile delete mode 100644 commotion_client/GUI/ui/untitled/untitled.qml delete mode 100644 commotion_client/GUI/ui/untitled/untitled.qmlproject delete mode 100644 commotion_client/GUI/ui/untitled/untitled.qmlproject.user delete mode 100644 commotion_client/GUI/ui/untitled1/deployment.pri delete mode 100644 commotion_client/GUI/ui/untitled1/main.cpp delete mode 100644 commotion_client/GUI/ui/untitled1/main.qml delete mode 100644 commotion_client/GUI/ui/untitled1/qml.qrc delete mode 100644 commotion_client/GUI/ui/untitled1/untitled1.pro delete mode 100644 commotion_client/GUI/ui/untitled1/untitled1.pro.user diff --git a/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile b/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile deleted file mode 100644 index 089e9be..0000000 --- a/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug/Makefile +++ /dev/null @@ -1,613 +0,0 @@ -############################################################################# -# Makefile for building: untitled1 -# Generated by qmake (3.0) (Qt 5.2.1) -# Project: ../untitled1/untitled1.pro -# Template: app -# Command: /opt/Qt/5.2.1/gcc/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_QUICK_LIB -DQT_QML_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -INCPATH = -I/opt/Qt/5.2.1/gcc/mkspecs/linux-g++ -I../untitled1 -I/opt/Qt/5.2.1/gcc/include -I/opt/Qt/5.2.1/gcc/include/QtQuick -I/opt/Qt/5.2.1/gcc/include/QtQml -I/opt/Qt/5.2.1/gcc/include/QtWidgets -I/opt/Qt/5.2.1/gcc/include/QtNetwork -I/opt/Qt/5.2.1/gcc/include/QtGui -I/opt/Qt/5.2.1/gcc/include/QtCore -I. -I. -LINK = g++ -LFLAGS = -Wl,-rpath,/opt/Qt/5.2.1/gcc -Wl,-rpath,/opt/Qt/5.2.1/gcc/lib -LIBS = $(SUBLIBS) -L/opt/Qt/5.2.1/gcc/lib -lQt5Quick -lQt5Qml -lQt5Widgets -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread -AR = ar cqs -RANLIB = -QMAKE = /opt/Qt/5.2.1/gcc/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = cp -f -COPY_DIR = cp -f -R -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = ../untitled1/main.cpp qrc_qml.cpp -OBJECTS = main.o \ - qrc_qml.o -DIST = /opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf \ - ../untitled1/deployment.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf \ - ../untitled1/untitled1.pro \ - ../untitled1/qml.qrc \ - ../untitled1/untitled1.pro -QMAKE_TARGET = untitled1 -DESTDIR = #avoid trailing-slash linebreak -TARGET = untitled1 - - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9][^0-9]*\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true - -Makefile: ../untitled1/untitled1.pro /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf /opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf \ - ../untitled1/deployment.pri \ - /opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf \ - /opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf \ - ../untitled1/untitled1.pro \ - ../untitled1/qml.qrc \ - /opt/Qt/5.2.1/gcc/lib/libQt5Quick.prl \ - /opt/Qt/5.2.1/gcc/lib/libQt5Qml.prl \ - /opt/Qt/5.2.1/gcc/lib/libQt5Network.prl \ - /opt/Qt/5.2.1/gcc/lib/libQt5Core.prl \ - /opt/Qt/5.2.1/gcc/lib/libQt5Gui.prl \ - /opt/Qt/5.2.1/gcc/lib/libQt5Widgets.prl - $(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro -/opt/Qt/5.2.1/gcc/mkspecs/features/spec_pre.prf: -/opt/Qt/5.2.1/gcc/mkspecs/common/shell-unix.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/unix.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/linux.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/gcc-base-unix.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/g++-base.conf: -/opt/Qt/5.2.1/gcc/mkspecs/common/g++-unix.conf: -/opt/Qt/5.2.1/gcc/mkspecs/qconfig.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bluetooth_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_bootstrap_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_clucene_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_concurrent_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_core_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_dbus_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_declarative_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designer_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_designercomponents_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_gui_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_help_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimedia_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_multimediawidgets_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_network_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_nfc_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_opengl_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_openglextensions_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_platformsupport_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_positioning_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_printsupport_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qml_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qmltest_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quick_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_quickparticles_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_script_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_scripttools_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sensors_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_serialport_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_sql_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_svg_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_testlib_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_uitools_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkit_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_webkitwidgets_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_widgets_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_x11extras_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xml_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns.pri: -/opt/Qt/5.2.1/gcc/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/opt/Qt/5.2.1/gcc/mkspecs/features/qt_functions.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/qt_config.prf: -/opt/Qt/5.2.1/gcc/mkspecs/linux-g++/qmake.conf: -/opt/Qt/5.2.1/gcc/mkspecs/features/spec_post.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/exclusive_builds.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/default_pre.prf: -../untitled1/deployment.pri: -/opt/Qt/5.2.1/gcc/mkspecs/features/resolve_config.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/default_post.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/qml_debug.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/declarative_debug.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/warn_on.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/qt.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/resources.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/moc.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/unix/opengl.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/uic.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/unix/thread.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/testcase_targets.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/exceptions.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/yacc.prf: -/opt/Qt/5.2.1/gcc/mkspecs/features/lex.prf: -../untitled1/untitled1.pro: -../untitled1/qml.qrc: -/opt/Qt/5.2.1/gcc/lib/libQt5Quick.prl: -/opt/Qt/5.2.1/gcc/lib/libQt5Qml.prl: -/opt/Qt/5.2.1/gcc/lib/libQt5Network.prl: -/opt/Qt/5.2.1/gcc/lib/libQt5Core.prl: -/opt/Qt/5.2.1/gcc/lib/libQt5Gui.prl: -/opt/Qt/5.2.1/gcc/lib/libQt5Widgets.prl: -qmake: FORCE - @$(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../untitled1/untitled1.pro - -qmake_all: FORCE - -dist: - @test -d .tmp/untitled11.0.0 || mkdir -p .tmp/untitled11.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/untitled11.0.0/ && $(COPY_FILE) --parents ../untitled1/qml.qrc .tmp/untitled11.0.0/ && $(COPY_FILE) --parents ../untitled1/main.cpp .tmp/untitled11.0.0/ && (cd `dirname .tmp/untitled11.0.0` && $(TAR) untitled11.0.0.tar untitled11.0.0 && $(COMPRESS) untitled11.0.0.tar) && $(MOVE) `dirname .tmp/untitled11.0.0`/untitled11.0.0.tar.gz . && $(DEL_FILE) -r .tmp/untitled11.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -check: first - -compiler_rcc_make_all: qrc_qml.cpp -compiler_rcc_clean: - -$(DEL_FILE) qrc_qml.cpp -qrc_qml.cpp: ../untitled1/qml.qrc \ - ../untitled1/main.qml - /opt/Qt/5.2.1/gcc/bin/rcc -name qml ../untitled1/qml.qrc -o qrc_qml.cpp - -compiler_moc_header_make_all: -compiler_moc_header_clean: -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_rcc_clean - -####### Compile - -main.o: ../untitled1/main.cpp /opt/Qt/5.2.1/gcc/include/QtWidgets/QApplication \ - /opt/Qt/5.2.1/gcc/include/QtWidgets/qapplication.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qcoreapplication.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qglobal.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qconfig.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qfeatures.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qsystemdetection.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qprocessordetection.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qcompilerdetection.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qglobalstatic.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qbasicatomic.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_bootstrap.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qgenericatomic.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_msvc.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_integrity.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qoldbasicatomic.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_vxworks.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_power.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_alpha.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv7.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv6.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_armv5.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_bfin.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_ia64.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_mips.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_s390.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_sh4a.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_sparc.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_x86.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_cxx11.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_gcc.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qatomic_unix.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qmutex.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qlogging.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qflags.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qtypeinfo.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qtypetraits.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qsysinfo.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qstring.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qchar.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qbytearray.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qrefcount.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qnamespace.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qarraydata.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qstringbuilder.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qobject.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qobjectdefs.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qobjectdefs_impl.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qlist.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qalgorithms.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qiterator.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qcoreevent.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qscopedpointer.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qmetatype.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qvarlengtharray.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qcontainerfwd.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qisenum.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qobject_impl.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qeventloop.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qwindowdefs.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qwindowdefs_win.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qpoint.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qsize.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qcursor.h \ - /opt/Qt/5.2.1/gcc/include/QtWidgets/qdesktopwidget.h \ - /opt/Qt/5.2.1/gcc/include/QtWidgets/qwidget.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qmargins.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qrect.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qpaintdevice.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qpalette.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qcolor.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qrgb.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qstringlist.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qdatastream.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qiodevice.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qpair.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qregexp.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qstringmatcher.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qbrush.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qvector.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qmatrix.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qpolygon.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qregion.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qline.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qtransform.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qpainterpath.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qimage.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qpixmap.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qsharedpointer.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qshareddata.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qsharedpointer_impl.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qhash.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qfont.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qfontmetrics.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qfontinfo.h \ - /opt/Qt/5.2.1/gcc/include/QtWidgets/qsizepolicy.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qkeysequence.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qevent.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qvariant.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qmap.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qdebug.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qtextstream.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qlocale.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qset.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qcontiguouscache.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qurl.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qurlquery.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qfile.h \ - /opt/Qt/5.2.1/gcc/include/QtCore/qfiledevice.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qvector2d.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qtouchdevice.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qguiapplication.h \ - /opt/Qt/5.2.1/gcc/include/QtGui/qinputmethod.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/QQmlApplicationEngine \ - /opt/Qt/5.2.1/gcc/include/QtQml/qqmlapplicationengine.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qqmlengine.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qjsengine.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qjsvalue.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qtqmlglobal.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qqmlerror.h \ - /opt/Qt/5.2.1/gcc/include/QtQml/qqmldebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../untitled1/main.cpp - -qrc_qml.o: qrc_qml.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_qml.o qrc_qml.cpp - -####### Install - -install_target: first FORCE - @test -d $(INSTALL_ROOT)/opt/untitled1/bin || mkdir -p $(INSTALL_ROOT)/opt/untitled1/bin - -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/opt/untitled1/bin/$(QMAKE_TARGET)" - -uninstall_target: FORCE - -$(DEL_FILE) "$(INSTALL_ROOT)/opt/untitled1/bin/$(QMAKE_TARGET)" - -$(DEL_DIR) $(INSTALL_ROOT)/opt/untitled1/bin/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/commotion_client/GUI/ui/untitled/untitled.qml b/commotion_client/GUI/ui/untitled/untitled.qml deleted file mode 100644 index 6d2ddd8..0000000 --- a/commotion_client/GUI/ui/untitled/untitled.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.2 - -Rectangle { - width: 360 - height: 360 - - MouseArea { - anchors.fill: parent - onClicked: { - Qt.quit(); - } - } - - Text { - anchors.centerIn: parent - text: "Hello World" - } -} - diff --git a/commotion_client/GUI/ui/untitled/untitled.qmlproject b/commotion_client/GUI/ui/untitled/untitled.qmlproject deleted file mode 100644 index 6ee21c5..0000000 --- a/commotion_client/GUI/ui/untitled/untitled.qmlproject +++ /dev/null @@ -1,20 +0,0 @@ -/* File generated by Qt Creator, version 2.7.0 */ - -import QmlProject 1.1 - -Project { - mainFile: "untitled.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - // importPaths: [ "../exampleplugin" ] -} diff --git a/commotion_client/GUI/ui/untitled/untitled.qmlproject.user b/commotion_client/GUI/ui/untitled/untitled.qmlproject.user deleted file mode 100644 index 673491a..0000000 --- a/commotion_client/GUI/ui/untitled/untitled.qmlproject.user +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - -1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.TargetCount - 0 - - - ProjectExplorer.Project.Updater.EnvironmentId - {778eb0d1-91e8-4c9f-8826-260a5cc73d96} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - - diff --git a/commotion_client/GUI/ui/untitled1/deployment.pri b/commotion_client/GUI/ui/untitled1/deployment.pri deleted file mode 100644 index 5441b63..0000000 --- a/commotion_client/GUI/ui/untitled1/deployment.pri +++ /dev/null @@ -1,27 +0,0 @@ -android-no-sdk { - target.path = /data/user/qt - export(target.path) - INSTALLS += target -} else:android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/commotion_client/GUI/ui/untitled1/main.cpp b/commotion_client/GUI/ui/untitled1/main.cpp deleted file mode 100644 index a22e2e8..0000000 --- a/commotion_client/GUI/ui/untitled1/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); - - return app.exec(); -} diff --git a/commotion_client/GUI/ui/untitled1/main.qml b/commotion_client/GUI/ui/untitled1/main.qml deleted file mode 100644 index 4187749..0000000 --- a/commotion_client/GUI/ui/untitled1/main.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Controls 1.1 - -ApplicationWindow { - visible: true - width: 640 - height: 480 - title: qsTr("Hello World") - - menuBar: MenuBar { - Menu { - title: qsTr("File") - MenuItem { - text: qsTr("Exit") - onTriggered: Qt.quit(); - } - } - } - - Text { - text: qsTr("Hello World") - anchors.centerIn: parent - } -} diff --git a/commotion_client/GUI/ui/untitled1/qml.qrc b/commotion_client/GUI/ui/untitled1/qml.qrc deleted file mode 100644 index 5f6483a..0000000 --- a/commotion_client/GUI/ui/untitled1/qml.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - - diff --git a/commotion_client/GUI/ui/untitled1/untitled1.pro b/commotion_client/GUI/ui/untitled1/untitled1.pro deleted file mode 100644 index 1cdc565..0000000 --- a/commotion_client/GUI/ui/untitled1/untitled1.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app - -QT += qml quick widgets - -SOURCES += main.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Default rules for deployment. -include(deployment.pri) diff --git a/commotion_client/GUI/ui/untitled1/untitled1.pro.user b/commotion_client/GUI/ui/untitled1/untitled1.pro.user deleted file mode 100644 index e398484..0000000 --- a/commotion_client/GUI/ui/untitled1/untitled1.pro.user +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.2.1 GCC 32bit - Desktop Qt 5.2.1 GCC 32bit - qt.521.gcc.essentials_kit - 0 - 0 - 0 - - /home/griffin/commotion-client/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/griffin/commotion-client/commotion_client/GUI/ui/build-untitled1-Desktop_Qt_5_2_1_GCC_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - untitled1 - - Qt4ProjectManager.Qt4RunConfiguration:/home/griffin/commotion-client/commotion_client/GUI/ui/untitled1/untitled1.pro - - untitled1.pro - false - false - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {778eb0d1-91e8-4c9f-8826-260a5cc73d96} - - - ProjectExplorer.Project.Updater.FileVersion - 15 - -