WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-09 04:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve gui

Browse Source
This commit is contained in:
lins_win 2012-11-06 19:45:03 +08:00 committed by lins05
parent 71383e5c5c
commit 48d1e4c7bc
11 changed files with 15 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/gtk/Makefile.am
View File

@ -34,7 +34,7 @@ seafile_applet_LDADD = @CCNET_LIBS@ \
seafile_applet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@
ui = seafile-trayicon.ui init-ccnet-window.ui init-seafile-window.ui
ui = seafile-trayicon.ui init-seafile-window.ui
uidir = $(pkgdatadir)
ui_DATA = $(ui)

183
gui/gtk/init-ccnet-window.ui
View File

@ -1,183 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.22"/>
<object class="GtkDialog" id="dialog">
<property name="width_request">500</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">5</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="generate_button">
<property name="label" translatable="yes">Generate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
<property name="spacing">10</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0.0099999997764825821</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">23</property>
<property name="ypad">20</property>
<property name="label" translatable="yes">Seafile is a distributed file synchronization tool.
Input a nickname, and let's begin using of Seafile.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Welcome to Seafile&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="n_columns">3</property>
<property name="row_spacing">4</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="label" translatable="yes">_Nickname:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name_entry</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">10</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="error_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.20000000298023224</property>
<property name="label" translatable="yes">Two or more character</property>
<attributes>
<attribute name="foreground" value="#000000000000"/>
</attributes>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Input nickname&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="1">cancel_button</action-widget>
<action-widget response="2">generate_button</action-widget>
</action-widgets>
</object>
</interface>

4
gui/gtk/seafile-trayicon.ui
View File

@ -64,8 +64,8 @@
<property name="stock">gtk-quit</property>
</object>
<object class="GtkAction" id="restart_network_action">
<property name="label">Restart Daemon</property>
<property name="tooltip">Restart Daemon</property>
<property name="label">Restart</property>
<property name="tooltip">Restart</property>
<property name="stock_id">gtk-refresh</property>
</object>
<object class="GtkAction" id="disable_auto_sync_action">

4
gui/win/init-ccnet.c
View File

@ -285,7 +285,7 @@ InitSeafileProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_INITDIALOG:
InitComboxList(hDlg);
set_dlg_icon (hDlg, IDI_STATUS_UP);
set_dlg_icon (hDlg, IDI_SEAFILE_ICON);
SetWindowText (GetDlgItem(hDlg, IDC_STATIC_TITLE), _("Choose a disk"));
set_control_font (GetDlgItem(hDlg, IDC_STATIC_TITLE), _("Courier"));
make_wnd_foreground(hDlg);
@ -379,7 +379,7 @@ Win7TipProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message) {
case WM_INITDIALOG:
set_dlg_icon (hDlg, IDI_STATUS_UP);
set_dlg_icon (hDlg, IDI_SEAFILE_ICON);
make_wnd_foreground (hDlg);
break;

2
gui/win/resource.en.h
View File

@ -5,7 +5,7 @@
#define IDI_STARTINTRAY 102
#define IDS_APP_TITLE 103
#define IDM_EXIT 105
#define IDI_CCNET_ICON 107
#define IDI_SEAFILE_ICON 107
#define IDC_STARTINTRAY 108
#define IDI_STATUS_UP 110
#define IDI_STATUS_DOWN 111

2
gui/win/resource.h
View File

@ -5,7 +5,7 @@
#define IDI_STARTINTRAY 102
#define IDS_APP_TITLE 103
#define IDM_EXIT 105
#define IDI_CCNET_ICON 107
#define IDI_SEAFILE_ICON 107
#define IDC_STARTINTRAY 108
#define IDI_STATUS_UP 110
#define IDI_STATUS_DOWN 111

2
gui/win/trayicon.c
View File

@ -100,7 +100,7 @@ create_applet_window ()
wcex.lpfnWndProc = (WNDPROC)WndProc;
wcex.hInstance = applet->hInstance;
wcex.lpszClassName = "seafile-applet";
wcex.hIcon = LoadIcon(applet->hInstance, MAKEINTRESOURCE(IDI_CCNET_ICON));
wcex.hIcon = LoadIcon(applet->hInstance, MAKEINTRESOURCE(IDI_SEAFILE_ICON));
RegisterClassEx(&wcex);
applet->hWnd = CreateWindow("seafile-applet", "seafile-applet",

2
gui/win/trayicon.en.rc
View File

@ -30,7 +30,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CCNET_ICON ICON "seafile.ico"
IDI_SEAFILE_ICON ICON "seafile.ico"
IDI_STATUS_UP ICON "ccnet_daemon_up.ico"
IDI_STATUS_DOWN ICON "ccnet_daemon_down.ico"
IDI_STATUS_TRANSFER_1 ICON "seafile_transfer_1.ico"

2
gui/win/trayicon.rc
View File

@ -30,7 +30,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CCNET_ICON ICON "seafile.ico"
IDI_SEAFILE_ICON ICON "seafile.ico"
IDI_STATUS_UP ICON "ccnet_daemon_up.ico"
IDI_STATUS_DOWN ICON "ccnet_daemon_down.ico"
IDI_STATUS_TRANSFER_1 ICON "seafile_transfer_1.ico"

1
web/settings.py
View File

@ -2,6 +2,7 @@
DEBUG = False
DEFAULT_HELP_WEB = "http://seafile.com/help/"
DEFAULT_HELP_WEB_EN = "http://seafile.com/en/help/"
SHOW_SYSTEM = False
SHOW_INTERNAL = False

4
web/templates/base.html
View File

@ -43,7 +43,11 @@
<a href="/settings/">${_("Settings")}</a>
</li>
<li class="help-item">
% if lang == 'zh_CN':
<a href=${settings.DEFAULT_HELP_WEB}>${_("Help")}</a>
% else:
<a href=${settings.DEFAULT_HELP_WEB_EN}>${_("Help")}</a>
% endif
</li>
</ul>
</div>