From b8e034e33c6f2f420dddce6d1c9aaa40d8290c39 Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf2008@163.com>
Date: Thu, 17 Jul 2014 19:20:00 +0800
Subject: [PATCH] Add proxy setting UI #118

---
 Wox/SettingWindow.xaml | 60 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 5559efccf0..99a1c9bbde 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -22,16 +22,12 @@
     <TabControl Height="auto" >
         <TabItem Header="General">
             <StackPanel Orientation="Vertical" Margin="10">
-                <StackPanel Orientation="Horizontal" Margin="10">
-                    <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" >
-                        Start Wox on system startup
-                    </CheckBox>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="10">
-                    <CheckBox x:Name="cbHideWhenDeactive" >
-                        Hide Wox when loses focus
-                    </CheckBox>
-                </StackPanel>
+                <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" Margin="10">
+                    Start Wox on system startup
+                </CheckBox>
+                <CheckBox x:Name="cbHideWhenDeactive" Margin="10">
+                    Hide Wox when loses focus
+                </CheckBox>
             </StackPanel>
         </TabItem>
         <TabItem Header="Plugin">
@@ -215,7 +211,7 @@
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>
-                   
+
                 </Grid>
             </Grid>
         </TabItem>
@@ -265,5 +261,47 @@
                 </StackPanel>
             </Grid>
         </TabItem>
+        <TabItem Header="Proxy">
+            <StackPanel>
+                <CheckBox x:Name="cbEnableProxy" Margin="10">Enable Proxy</CheckBox>
+                <Grid Margin="10">
+                    <Grid.RowDefinitions>
+                        <RowDefinition ></RowDefinition>
+                        <RowDefinition ></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"></ColumnDefinition>
+                        <ColumnDefinition Width="220"></ColumnDefinition>
+                        <ColumnDefinition Width="80"></ColumnDefinition>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <Border Grid.Row="0" Grid.Column="0" Padding="5">
+                        <TextBlock >Server</TextBlock>
+                    </Border>
+                    <Border Grid.Row="0" Grid.Column="1" Padding="5">
+                        <TextBox  Width="200" HorizontalAlignment="Left"></TextBox>
+                    </Border>
+                    <Border Grid.Row="0" Grid.Column="2" Padding="5">
+                        <TextBlock>Port</TextBlock>
+                    </Border>
+                    <Border Grid.Row="0" Grid.Column="3" Padding="5">
+                        <TextBox Width="50" HorizontalAlignment="Left"></TextBox>
+                    </Border>
+                    <Border Grid.Row="1" Grid.Column="0" Padding="5">
+                        <TextBlock >UserName</TextBlock>
+                    </Border>
+                    <Border Grid.Row="1" Grid.Column="1" Padding="5">
+                        <TextBox Width="200" HorizontalAlignment="Left"></TextBox>
+                    </Border>
+                    <Border Grid.Row="1" Grid.Column="2" Padding="5">
+                        <TextBlock>Password</TextBlock>
+                    </Border>
+                    <Border Grid.Row="1" Grid.Column="3" Padding="5">
+                        <TextBox Width="200" HorizontalAlignment="Left"></TextBox>
+                    </Border>
+                </Grid>
+                <Button x:Name="btnTestProxy" Width="80" HorizontalAlignment="Left" Margin="10">Test Proxy</Button>
+            </StackPanel>
+        </TabItem>
     </TabControl>
 </Window>