Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Commotion Qt UI frontends round one #28

Closed
wants to merge 9 commits into from
Closed

Commotion Qt UI frontends round one #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42369a8
adding ui elements
glamrock Apr 25, 2014
7440ec7
update
glamrock Apr 28, 2014
a1ea135
uis that need code
glamrock Apr 28, 2014
06127b0
app_advertiser
glamrock Apr 28, 2014
df20769
tab order
glamrock Apr 28, 2014
d938d48
basic_settings.ui
glamrock Apr 28, 2014
b81f061
user_security_settings.ui
glamrock Apr 28, 2014
b2bb161
added unfinished items
glamrock Apr 28, 2014
3dccf0b
herped a derp
glamrock Apr 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 50 additions & 9 deletions commotion_client/GUI/ui/crash_report_window.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string>Commotion Error</string>
</property>
<property name="windowIcon">
<iconset resource="../assets/commotion_assets.qrc">
<iconset>
<normaloff>:/alert32.png</normaloff>:/alert32.png</iconset>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
Expand All @@ -29,7 +29,7 @@
<height>501</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,1,0,0,0,1">
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,1,0,0,0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
Expand All @@ -38,12 +38,19 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../assets/commotion_assets.qrc">:/alert48.png</pixmap>
<pixmap>:/alert48.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="sorry_label">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Sorry!</string>
</property>
Expand Down Expand Up @@ -79,7 +86,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>6</number>
<number>4</number>
</property>
<item>
<widget class="QLabel" name="error_text">
Expand All @@ -93,7 +100,7 @@
<string>Commotion has experienced an unknown error.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="margin">
<number>1</number>
Expand Down Expand Up @@ -130,8 +137,14 @@
</item>
<item>
<widget class="QCheckBox" name="send_report">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Send a report to the commotion team.</string>
<string>Send a report to the Commotion team.</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
Expand All @@ -144,7 +157,7 @@
</size>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
Expand All @@ -166,6 +179,8 @@
</size>
</property>
</widget>
<zorder>comment_field</zorder>
<zorder></zorder>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
Expand Down Expand Up @@ -218,7 +233,7 @@
<property name="lineWidth">
<number>0</number>
</property>
<property name="numDigits">
<property name="digitCount">
<number>1</number>
</property>
<property name="intValue" stdset="0">
Expand Down Expand Up @@ -249,17 +264,43 @@
<item>
<widget class="QPushButton" name="quit_button">
<property name="text">
<string>Quit Commotion</string>
<string>Quit</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="restart_button">
<property name="text">
<string>Restart Commotion</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>29</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
Expand Down