[Openlanhouse-development] SF.net SVN: openlanhouse:[316] trunk
Status: Pre-Alpha
Brought to you by:
n3rd3x
Menu
▾
▴
[Openlanhouse-development] SF.net SVN: openlanhouse:[316] trunk
|
From: <n3...@us...> - 2008-10-28 20:55:13
|
Revision: 316
http://openlanhouse.svn.sourceforge.net/openlanhouse/?rev=316&view=rev
Author: n3rd3x
Date: 2008-10-28 20:55:06 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/openlh-core/src/OpenlhCore/utils.py
trunk/openlh-server/data/glade/prefs.glade
trunk/openlh-server/data/openlh-server.schemas.in
Modified: trunk/openlh-core/src/OpenlhCore/utils.py
===================================================================
--- trunk/openlh-core/src/OpenlhCore/utils.py 2008-10-28 16:33:56 UTC (rev 315)
+++ trunk/openlh-core/src/OpenlhCore/utils.py 2008-10-28 20:55:06 UTC (rev 316)
@@ -30,7 +30,7 @@
dl = None
import base64
-from md5 import md5
+from hashlib import md5
import threading
import time
import traceback
Modified: trunk/openlh-server/data/glade/prefs.glade
===================================================================
--- trunk/openlh-server/data/glade/prefs.glade 2008-10-28 16:33:56 UTC (rev 315)
+++ trunk/openlh-server/data/glade/prefs.glade 2008-10-28 20:55:06 UTC (rev 316)
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Aug 6 12:14:38 2008 -->
+<?xml version="1.0"?>
<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkDialog" id="prefs">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">6</property>
@@ -36,46 +35,62 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkEntry" id="currency">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Name:</property>
- <property name="use_markup">True</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">lan_name</property>
+ <signal name="focus_out_event" handler="on_currency_focus_out_event"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="lan_name">
+ <widget class="GtkSpinButton" id="price_hour">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">name for lanhouse network</property>
- <signal name="focus_out_event" handler="lan_name_changed"/>
+ <property name="adjustment">0 0 100 0.01 10 10</property>
+ <property name="digits">2</property>
+ <signal name="focus_out_event" handler="on_price_hour_focus_out_event"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkEntry" id="admin_email">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <signal name="focus_out_event" handler="admin_email_changed"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Price hour:</property>
+ <property name="label" translatable="yes">_Administrator email:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">price_hour</property>
+ <property name="mnemonic_widget">admin_email</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -98,66 +113,50 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Administrator email:</property>
+ <property name="label" translatable="yes">_Price hour:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">admin_email</property>
+ <property name="mnemonic_widget">price_hour</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="admin_email">
+ <widget class="GtkEntry" id="lan_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="focus_out_event" handler="admin_email_changed"/>
+ <property name="tooltip" translatable="yes">name for lanhouse network</property>
+ <signal name="focus_out_event" handler="lan_name_changed"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="price_hour">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 0.01 10 10</property>
- <property name="digits">2</property>
- <signal name="focus_out_event" handler="on_price_hour_focus_out_event"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">lan_name</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <widget class="GtkEntry" id="currency">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="focus_out_event" handler="on_currency_focus_out_event"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -175,8 +174,8 @@
<property name="use_underline">True</property>
</widget>
<packing>
+ <property name="tab_fill">False</property>
<property name="type">tab</property>
- <property name="tab_fill">False</property>
</packing>
</child>
<child>
@@ -224,6 +223,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Login support</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_machine_login_suport_toggled"/>
</widget>
@@ -235,6 +235,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Ticket support</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_ticket_suport_toggled"/>
</widget>
@@ -288,32 +289,34 @@
<placeholder/>
</child>
<child>
- <widget class="GtkCheckButton" id="background_bnt">
+ <widget class="GtkCheckButton" id="logo_bnt">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Background:</property>
+ <property name="label" translatable="yes">_Logo:</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="background_bnt_toggled_cb"/>
+ <signal name="toggled" handler="on_logo_bnt_toggled"/>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="logo_bnt">
+ <widget class="GtkCheckButton" id="background_bnt">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Logo:</property>
+ <property name="label" translatable="yes">_Background:</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_logo_bnt_toggled"/>
+ <signal name="toggled" handler="background_bnt_toggled_cb"/>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -361,37 +364,31 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="default_welcome_msg">
+ <widget class="GtkLabel" id="">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Default: "Welcome"</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="custom_welcome_msg">
+ <widget class="GtkLabel" id="label21">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">C_ustom:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><small><i>%n will be replaced by hostname</i></small></property>
+ <property name="use_markup">True</property>
<property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">default_welcome_msg</property>
- <signal name="toggled" handler="on_custom_welcome_msg_toggled"/>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -412,31 +409,39 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label21">
+ <widget class="GtkRadioButton" id="custom_welcome_msg">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><small><i>%n will be replaced by hostname</i></small></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">C_ustom:</property>
<property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">default_welcome_msg</property>
+ <signal name="toggled" handler="on_custom_welcome_msg_toggled"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="">
+ <widget class="GtkRadioButton" id="default_welcome_msg">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_Default: "Welcome"</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -472,11 +477,58 @@
<property name="use_underline">True</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">18</property>
+ <child>
+ <widget class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Session Finishing</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Actions</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
Modified: trunk/openlh-server/data/openlh-server.schemas.in
===================================================================
--- trunk/openlh-server/data/openlh-server.schemas.in 2008-10-28 16:33:56 UTC (rev 315)
+++ trunk/openlh-server/data/openlh-server.schemas.in 2008-10-28 20:55:06 UTC (rev 316)
@@ -493,4 +493,32 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/openlh-server/close_apps</key>
+ <applyto>/apps/openlh-server/close_apps</applyto>
+ <owner>openlh-server</owner>
+ <type>bool</type>
+ <default>false</default>
+
+ <locale name="C">
+ <short>If true, applications will closed after finishing the session</short>
+ <long>If true, applications will closed after finishing the session.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/openlh-server/close_apps_list</key>
+ <applyto>/apps/openlh-server/close_apps_list</applyto>
+ <owner>openlh-server</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+
+ <locale name="C">
+ <short>Applications to be closed after finishing the session</short>
+ <long>Applications to be closed after finishing the session.</long>
+ </locale>
+ </schema>
+
+
+
</schemalist></gconfschemafile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|