Resolving merge with master

This commit is contained in:
adisbladis 2017-05-13 00:34:05 +08:00
commit a042090cb7
Failed to generate hash of commit
2 changed files with 210 additions and 184 deletions

View file

@ -2,24 +2,42 @@
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="windowModality">
<enum>Qt::NonModal</enum>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>490</width>
<height>220</height>
<width>430</width>
<height>169</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>490</width>
<height>220</height>
<width>430</width>
<height>160</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>490</width>
<height>220</height>
<width>680</width>
<height>250</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>35</width>
<height>9</height>
</size>
</property>
<property name="font">
@ -30,187 +48,195 @@
<property name="windowTitle">
<string>OpenSnitch</string>
</property>
<widget class="QLabel" name="appNameLabel">
<property name="geometry">
<rect>
<x>30</x>
<y>20</y>
<width>500</width>
<height>25</height>
</rect>
<property name="sizeGripEnabled">
<bool>false</bool>
</property>
<property name="modal">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Chromium Web Browser</string>
</property>
</widget>
<widget class="Line" name="line">
<property name="geometry">
<rect>
<x>0</x>
<y>50</y>
<width>491</width>
<height>16</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QLabel" name="messageLabel">
<property name="geometry">
<rect>
<x>30</x>
<y>80</y>
<width>431</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string>Chromium Web Browser (/usr/lib/chromium-browser) wants to connect to host 127.0.0.1 on TCP port 443 (https)</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="whitelistButton">
<property name="geometry">
<rect>
<x>25</x>
<y>170</y>
<width>105</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Whitelist app</string>
</property>
</widget>
<widget class="QPushButton" name="blockButton">
<property name="geometry">
<rect>
<x>135</x>
<y>170</y>
<width>105</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Block app</string>
</property>
</widget>
<widget class="QPushButton" name="denyButton">
<property name="geometry">
<rect>
<x>245</x>
<y>170</y>
<width>105</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Deny</string>
</property>
</widget>
<widget class="QPushButton" name="allowButton">
<property name="geometry">
<rect>
<x>355</x>
<y>170</y>
<width>105</width>
<height>32</height>
</rect>
</property>
<property name="font">
<font>
<strikeout>false</strikeout>
</font>
</property>
<property name="mouseTracking">
<bool>false</bool>
</property>
<property name="text">
<string>Allow</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QComboBox" name="actionComboBox">
<property name="geometry">
<rect>
<x>139</x>
<y>126</y>
<width>97</width>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>97</width>
<height>26</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>97</width>
<height>26</height>
</size>
</property>
<item>
<property name="text">
<string>Once</string>
</property>
<item row="3" column="1">
<spacer name="horizontalSpacer">
<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>
<property name="text">
<string>Until Quit</string>
</property>
<item row="5" column="0">
<widget class="QPushButton" name="whitelistButton">
<property name="text">
<string>Whitelist app</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Forever</string>
</property>
<item row="0" column="5">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</widget>
<widget class="QLabel" name="actionLabel">
<property name="geometry">
<rect>
<x>30</x>
<y>130</y>
<width>111</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Take this action:</string>
</property>
</widget>
<widget class="QLabel" name="iconLabel">
<property name="geometry">
<rect>
<x>430</x>
<y>-2</y>
<width>60</width>
<height>60</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
<item row="5" column="1" colspan="2">
<widget class="QPushButton" name="blockButton">
<property name="text">
<string>Block app</string>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QPushButton" name="denyButton">
<property name="text">
<string>Deny</string>
</property>
</widget>
</item>
<item row="5" column="4" colspan="2">
<widget class="QPushButton" name="allowButton">
<property name="font">
<font>
<strikeout>false</strikeout>
</font>
</property>
<property name="mouseTracking">
<bool>false</bool>
</property>
<property name="text">
<string>Allow</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="actionComboBox">
<property name="minimumSize">
<size>
<width>97</width>
<height>26</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>97</width>
<height>26</height>
</size>
</property>
<item>
<property name="text">
<string>Once</string>
</property>
</item>
<item>
<property name="text">
<string>Until Quit</string>
</property>
</item>
<item>
<property name="text">
<string>Forever</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="actionLabel">
<property name="text">
<string>Take this action:</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<widget class="QLabel" name="appNameLabel">
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Chromium Web Browser</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="6">
<widget class="QLabel" name="messageLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
<height>400</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>35</width>
<height>18</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string>Chromium Web Browser (/usr/lib/chromium-browser) wants to connect to host 127.0.0.1 on TCP port 443 (https)</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>1</number>
</property>
<property name="indent">
<number>1</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>

View file

@ -27,7 +27,7 @@ import os
# TODO: Implement rules editor.
RESOURCES_PATH = "%s/resources/" % os.path.dirname(
sys.modules[__name__].__file__)
DIALOG_UI_PATH = "%s/dialog_hi.ui" % RESOURCES_PATH
DIALOG_UI_PATH = "%s/dialog.ui" % RESOURCES_PATH
class QtApp: