diff --git a/CHANGELOG.md b/CHANGELOG.md index 7deeaa2..166a56e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v7.4.17 + - Changed Windows default theme to be same as Clearlooks-Vista. + ## v7.4.15 - Removed crashing themes: Evil-Mac & Outcrop. - Ignore invalid UTF-8 characters in log file. diff --git a/README.md b/README.md index 766c645..c4b06cf 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ To run: python FAHControl -See: https://folding.stanford.edu +See: https://foldingathome.org/ # Prerequisites diff --git a/SConstruct b/SConstruct index e025524..da68ac9 100644 --- a/SConstruct +++ b/SConstruct @@ -67,9 +67,9 @@ if env['PLATFORM'] == 'darwin' or env.GetPackageType() == 'rpm': version = version, maintainer = 'Joseph Coffland ', vendor = 'Folding@home', - url = 'http://folding.stanford.edu/', + url = 'https://foldingathome.org/', license = 'LICENSE.txt', - bug_url = 'https://fah-web.stanford.edu/projects/FAHClient/', + bug_url = 'https://foldingathome.org/bugs/', summary = 'Folding@home Control', description = \ 'Control and monitor local and remote Folding@home clients', @@ -85,7 +85,7 @@ if env['PLATFORM'] == 'darwin' or env.GetPackageType() == 'rpm': rpm_build = 'rpm/build', rpm_filelist = 'filelist.txt', - pkg_id = 'edu.stanford.folding.fahcontrol.pkg', + pkg_id = 'org.foldingathome.fahcontrol.pkg', pkg_resources = 'osx/Resources', pkg_apps = [['dist/FAHControl.app', 'Folding@home/FAHControl.app']], pkg_scripts = 'osx/scripts', diff --git a/debian/copyright b/debian/copyright index 0f601ff..a8be907 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: fahcontrol -Source: https://fah-web.stanford.edu/svn/pub/trunk/ +Source: https://github.com/FoldingAtHome/fah-control/ Files: * -Copyright: 2010-2016 Stanford University +Copyright: 2010-2018 foldingathome.org License: GPL-3.0+ License: GPL-3.0+ diff --git a/fah/ClientConfig.py b/fah/ClientConfig.py index f5937b7..1ec469d 100644 --- a/fah/ClientConfig.py +++ b/fah/ClientConfig.py @@ -221,19 +221,6 @@ class ClientConfig: entry['project'], entry['run'], entry['clone'], entry['gen']) set_widget_str_value(app.queue_widgets['prcg'], prcg) - # Links - for name in ['cs', 'ws', 'project']: - widget = app.queue_widgets[name] - value = str(entry[name]) - - if name in ['cs', 'ws']: - uri = 'http://fah-web.stanford.edu/logs/%s.log.html' % value - else: - uri = 'http://fah-web.stanford.edu/cgi-bin/fahproject.' \ - 'overusingIPswillbebanned?p=' + value - - widget.set_uri(uri) - def select_slot(self, app): # Get selected slot diff --git a/fah/FAHControl.glade b/fah/FAHControl.glade index f0bb9d0..80ee1fc 100644 --- a/fah/FAHControl.glade +++ b/fah/FAHControl.glade @@ -108,7 +108,7 @@ True False - Copyright © 2010-2016 Stanford University + Copyright © 2010-2018 foldingathome.org False @@ -118,13 +118,13 @@ - http://folding.stanford.edu/ + https://foldingathome.org/ False True False True none - http://folding.stanford.edu/ + https://foldingathome.org/ False @@ -1213,7 +1213,7 @@ Would you like to configure your identity now? False True none - http://fah-web.stanford.edu/cgi-bin/getpasskey.py + https://foldingathome.org/newpasskey False diff --git a/fah/FAHControl.py b/fah/FAHControl.py index cc2401a..d450444 100644 --- a/fah/FAHControl.py +++ b/fah/FAHControl.py @@ -127,8 +127,7 @@ class FAHControl(SingleAppServer): # Glade editor strips the '&'s on save. Even if you use '&' the # ampersands get striped when resaved. team_stats_links = [ - ['Folding@home', 'http://fah-web.stanford.edu/cgi-bin/main.py' - '?qtype=teampage&teamnum=%(team)s'], + ['Folding@home', 'https://foldingathome.org/stats/team/%(team)s'], ['Extreme Overclocking', 'http://folding.extremeoverclocking.com/' 'team_summary.php?t=%(team)s'], ['Kakao Stats', 'http://kakaostats.com/tsum.php?t=%(team)s'], @@ -137,8 +136,7 @@ class FAHControl(SingleAppServer): ['Custom', ''], ] donor_stats_links = [ - ['Folding@home', 'http://fah-web.stanford.edu/cgi-bin/main.py' - '?qtype=userpage&username=%(donor)s'], + ['Folding@home', 'https://foldingathome.org/stats/donor/%(donor)s'], ['Custom', ''], ] diff --git a/osx/Resources/en.lproj/License.rtf b/osx/Resources/en.lproj/License.rtf index 96b499e..d53d3d3 100644 --- a/osx/Resources/en.lproj/License.rtf +++ b/osx/Resources/en.lproj/License.rtf @@ -10,7 +10,7 @@ \f0\b\fs32 \cf0 Folding@home Software License\ \pard\pardeftab709 -\f1\b0\fs20 \cf0 Copyright 2001-2016. Stanford University. All Rights Reserved.\ +\f1\b0\fs20 \cf0 Copyright 2001-2018. foldingathome.org. All Rights Reserved.\ \ \pard\pardeftab709 @@ -23,9 +23,9 @@ Please carefully read the following terms and conditions before using this softw \b Disclaimer of Warranty: \b0 \ \ -IN NO EVENT SHALL STANFORD UNIVERSITY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF STANFORD UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\ +IN NO EVENT SHALL FOLDINGATHOME.ORG BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF FOLDINGATHOME.ORG HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\ \ -STANFORD UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION PROVIDED HEREUNDER IS PROVIDED "AS IS". Folding@home HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\ +FOLDINGATHOME.ORG SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION PROVIDED HEREUNDER IS PROVIDED "AS IS". Folding@home HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\ \ \b Restrictions: @@ -35,8 +35,8 @@ You may use this software on a computer system only if you own the system or hav \ You may not alter the software or associated data files.\ \ -You may only use unmodified versions of Folding@home obtained through authorized distributors to connect to the Folding@home servers. Use of other software to connect to the Folding@home servers is strictly prohibited. This prohibition includes 3rd party installers which download directly from Stanford web sites, unless written permission is granted from Stanford University.\ +You may only use unmodified versions of Folding@home obtained through authorized distributors to connect to the Folding@home servers. Use of other software to connect to the Folding@home servers is strictly prohibited. This prohibition includes 3rd party installers which download directly from foldingathome.org, unless written permission is granted from foldingathome.org.\ \ -Distribution of this software is prohibited. It may only be obtained by downloading from Stanford's web site (http://folding.stanford.edu and pages linked therein) or the web site of one of our commercial partners (Sony, NVIDIA, and ATI).\ +Distribution of this software is prohibited. It may only be obtained by downloading from foldingathome.org (https://foldingathome.org/ and pages linked therein) or the web site of one of our commercial partners (Sony, NVIDIA, and ATI).\ \ } diff --git a/setup.py b/setup.py index 1598b5c..40f7fee 100644 --- a/setup.py +++ b/setup.py @@ -41,9 +41,9 @@ if sys.platform == 'darwin': plist = dict( CFBundleDisplayName = 'FAHControl', - CFBundleIdentifier = 'edu.stanford.folding.fahcontrol', + CFBundleIdentifier = 'org.foldingathome.fahcontrol', CFBundleSignature = '????', - NSHumanReadableCopyright = 'Copyright 2010-2016 Stanford University', + NSHumanReadableCopyright = 'Copyright 2010-2018 foldingathome.org', ) options = dict( @@ -97,7 +97,7 @@ if version is not None: description = \ '''Folding@home is a distributed computing project using volunteered -computer resources run by Pandegroup of Stanford University. +computer resources. ''' short_description = ''' This package contains FAHControl, a graphical monitor and control @@ -118,11 +118,10 @@ setup( author_email = 'joseph@cauldrondevelopment.com', license = 'GNU General Public License version 3', keywords = 'protein, molecular dynamics, simulation', - url = 'http://folding.stanford.edu/', + url = 'https://foldingathome.org/', package_data = {'fah': ['*.glade']}, **extra_opts) if sys.platform == 'darwin': with open('package-description.txt', 'w') as f: f.write(short_description.strip()) - diff --git a/themes/Windows-Default/gtk-2.0/gtkrc b/themes/Windows-Default/gtk-2.0/gtkrc index 89e3763..6e4e636 100644 --- a/themes/Windows-Default/gtk-2.0/gtkrc +++ b/themes/Windows-Default/gtk-2.0/gtkrc @@ -1,37 +1,273 @@ -gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32" -gtk-toolbar-icon-size = small-toolbar +# Clearlooks-Vista by Marius M. M. < devilx at gdesklets dot org> +# This theme is GPLed :) -# disable images in buttons. i've only seen ugly delphi apps use this feature. -gtk-button-images = 0 +gtk-icon-sizes = "panel-menu=16,16:panel=22,22" -# enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly. -# the office apps use them heavily, though. -gtk-menu-images = 1 - -# use the win32 button ordering instead of the GNOME HIG one, where applicable -gtk-alternative-button-order = 1 - -style "msw-default" +style "clearlooks-default" { - GtkWidget::interior-focus = 1 - GtkOptionMenu::indicator-size = { 9, 5 } - GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 } - GtkSpinButton::shadow-type = in + GtkButton::default_border = { 0, 0, 0, 0 } + GtkButton::default_outside_border = { 0, 0, 0, 0 } + GtkRange::trough_border = 0 - # Owen and I disagree that these should be themable - #GtkUIManager::add-tearoffs = 0 - #GtkComboBox::add-tearoffs = 0 - - GtkComboBox::appears-as-list = 1 - GtkComboBox::focus-on-click = 1 - - GOComboBox::add_tearoffs = 0 + GtkWidget::focus_padding = 1 - GtkTreeView::allow-rules = 0 - GtkTreeView::expander-size = 12 + GtkPaned::handle_size = 6 - engine "wimp" + GtkRange::slider_width = 15 + GtkRange::stepper_size = 15 + GtkScrollbar::min_slider_length = 30 + GtkCheckButton::indicator_size = 12 + GtkMenuBar::internal-padding = 0 + + GtkTreeView::expander_size = 14 + GtkTreeView::odd_row_color = "#EBF5FF" + GtkExpander::expander_size = 16 + + xthickness = 1 + ythickness = 1 + + fg[NORMAL] = "#505050" + fg[ACTIVE] = "#505050" + fg[SELECTED] = "#ffffff" + fg[INSENSITIVE] = "#9B9B9B" + + bg[NORMAL] = "#F5F5F5" + bg[ACTIVE] = "#f9f9f9" + bg[PRELIGHT] = "#FFFFFF" + bg[SELECTED] = "#095fb2" + bg[INSENSITIVE] = "#ffffff" + + base[NORMAL] = "#ffffff" + base[ACTIVE] = "#095fb2" + base[PRELIGHT] = "#FFFFFF" + base[INSENSITIVE]= "#ffffff" + base[SELECTED] = "#095fb2" + + text[INSENSITIVE]= "#9B9B9B" + text[SELECTED] = "#ffffff" + text[ACTIVE] = "#ffffff" + + engine "clearlooks" { + contrast = 1.1 + menubarstyle = 2 # 0 = flat, 1 = sunken, 2 = flat gradient + menuitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) + listviewitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient) + progressbarstyle = 1 # 0 = candy bar, 1 = flat } } -class "*" style "msw-default" + + +style "clearlooks-progressbar" = "clearlooks-default" +{ + fg[PRELIGHT] = "#ffffff" + xthickness = 1 + ythickness = 1 + +} + +style "clearlooks-wide" = "clearlooks-default" +{ + xthickness = 2 + ythickness = 2 +} + +style "clearlooks-button" = "clearlooks-default" +{ + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-notebook" = "clearlooks-wide" +{ + bg[NORMAL] = "#FAFAFA" +} + +style "clearlooks-tasklist" = "clearlooks-default" +{ + xthickness = 5 + ythickness = 3 +} + +style "clearlooks-menu" = "clearlooks-default" +{ + xthickness = 2 + ythickness = 1 +} + +style "clearlooks-menubar" = "clearlooks-default" +{ + xthickness = 2 + ythickness = 2 + bg[NORMAL] = "#449E20" + fg[NORMAL] = "#ffffff" + base[PRELIGHT] = "#63E62E" + base[SELECTED] = "#4DB224" +} + +style "clearlooks-menu-item" = "clearlooks-default" +{ + xthickness = 2 + ythickness = 3 + fg[PRELIGHT] = "#ffffff" + text[PRELIGHT] = "#ffffff" +} + +style "clearlooks-tree" = "clearlooks-default" +{ + xthickness = 2 + ythickness = 2 +} + +style "clearlooks-frame-title" = "clearlooks-default" +{ + fg[NORMAL] = "#505050" +} + +style "clearlooks-panel" = "clearlooks-default" +{ + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-tooltips" = "clearlooks-default" +{ + xthickness = 4 + ythickness = 4 + bg[NORMAL] = { 1.0,1.0,0.75 } +} + +style "clearlooks-combo" = "clearlooks-default" +{ + xthickness = 1 + ythickness = 2 +} + +style "metacity-frame" +{ + bg[SELECTED] = "#095fb2" + fg[SELECTED] = "#ffffff" +} + +style "panelbg" +{ + xthickness = 0 + ythickness = 0 + bg_pixmap[NORMAL] = "images/panelbg.png" + +} + +style "panelbuttons" +{ + xthickness = 2 + ythickness = 0 + + engine "pixmap" { + + image + { + function = BOX + recolorable = TRUE + state = NORMAL + file = "images/panelbutton1.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + +image + { + function = BOX + recolorable = TRUE + state = PRELIGHT + file = "images/panelbutton2.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image + { + function = BOX + recolorable = TRUE + shadow = OUT + state = PRELIGHT + file = "images/panelbutton1.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image + { + function = BOX + recolorable = TRUE + shadow = IN + state = PRELIGHT + file = "images/panelbutton3.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image + { + function = BOX + recolorable = TRUE + state = ACTIVE + file = "images/panelbutton3.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } +image + { + function = BOX + recolorable = TRUE + state = INSENSITIVE + file = "images/panelbutton2.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + } + +} + + +class "GtkWidget" style "clearlooks-default" +class "GtkButton" style "clearlooks-button" +class "GtkCombo" style "clearlooks-button" +class "GtkRange" style "clearlooks-wide" +class "GtkFrame" style "clearlooks-wide" +class "GtkMenu" style "clearlooks-menu" +class "GtkEntry" style "clearlooks-button" +class "GtkMenuItem" style "clearlooks-menu-item" +class "GtkStatusbar" style "clearlooks-wide" +class "GtkNotebook" style "clearlooks-notebook" +class "GtkProgressBar" style "clearlooks-progressbar" +class "*MenuBar*" style "clearlooks-menubar" +class "GtkMenuBar*" style "clearlooks-menubar" +class "MetaFrames" style "metacity-frame" +class "*Panel*" style "panelbg" +class "*notif*" style "panelbg" +class "*Notif*" style "panelbg" +class "*Tray*" style "panelbg" +class "*tray*" style "panelbg" + +widget_class "*MenuItem*" style "clearlooks-menu-item" + +widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" +widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" + +widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" +widget "gtk-tooltips" style "clearlooks-tooltips" + +widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" +widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" +widget_class "*.GtkList.GtkButton" style "clearlooks-tree" +widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" +widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" + +widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" +widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" + +widget_class "*MenuBar*" style "clearlooks-menubar" + +widget_class "*Panel*GtkToggleButton" style "panelbuttons" +widget_class "*Panel*GtkButton" style "panelbuttons" diff --git a/themes/Windows-Default/gtk-2.0/images/panelbg.png b/themes/Windows-Default/gtk-2.0/images/panelbg.png new file mode 100644 index 0000000..ff9a257 Binary files /dev/null and b/themes/Windows-Default/gtk-2.0/images/panelbg.png differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton1.png b/themes/Windows-Default/gtk-2.0/images/panelbutton1.png new file mode 100644 index 0000000..02e5e3c Binary files /dev/null and b/themes/Windows-Default/gtk-2.0/images/panelbutton1.png differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton2.png b/themes/Windows-Default/gtk-2.0/images/panelbutton2.png new file mode 100644 index 0000000..f2746fb Binary files /dev/null and b/themes/Windows-Default/gtk-2.0/images/panelbutton2.png differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton3.png b/themes/Windows-Default/gtk-2.0/images/panelbutton3.png new file mode 100644 index 0000000..55ac1c5 Binary files /dev/null and b/themes/Windows-Default/gtk-2.0/images/panelbutton3.png differ