diff --git a/.gitattributes b/.gitattributes index 8ce575eeb0..f3f95cfa6d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3593,9 +3593,6 @@ components/onlinepackagemanager/Makefile.compiled svneol=native#text/plain components/onlinepackagemanager/Makefile.fpc svneol=native#text/plain components/onlinepackagemanager/fpcmod/opkman_httpclient.pas svneol=native#text/pascal components/onlinepackagemanager/fpcmod/opkman_zip.pas svneol=native#text/pascal -components/onlinepackagemanager/images/1license.txt svneol=native#text/plain -components/onlinepackagemanager/images/Copyright.txt svneol=native#text/plain -components/onlinepackagemanager/images/ImageCopyright.txt svneol=native#text/plain components/onlinepackagemanager/images/ToolBar/Dis/00[!!-~]Refresh.png -text svneol=unset#image/png components/onlinepackagemanager/images/ToolBar/Dis/00[!!-~]Refresh_150.png -text svneol=unset#image/png components/onlinepackagemanager/images/ToolBar/Dis/00[!!-~]Refresh_200.png -text svneol=unset#image/png diff --git a/components/onlinepackagemanager/images/1license.txt b/components/onlinepackagemanager/images/1license.txt deleted file mode 100644 index 5762c1f4e1..0000000000 --- a/components/onlinepackagemanager/images/1license.txt +++ /dev/null @@ -1,17 +0,0 @@ -The icons are free for personal use and also free for commercial use, but we require linking to our web site. - -http://creativecommons.org/licenses/by-sa/3.0/ - -You are free: -* to Share — to copy, distribute and transmit the work - -Under the following conditions: -Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). - -Attribute this work: -What does "Attribute this work" mean? -The page you came from contained embedded licensing metadata, including how the creator wishes to be attributed for re-use. You can use the HTML here to cite the work. Doing so will also include metadata on your page so that others can find the original work as well. -Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same, similar or a compatible license. - -led24.de -31/05/2009 \ No newline at end of file diff --git a/components/onlinepackagemanager/images/Copyright.txt b/components/onlinepackagemanager/images/Copyright.txt deleted file mode 100644 index c3f4fb288b..0000000000 --- a/components/onlinepackagemanager/images/Copyright.txt +++ /dev/null @@ -1,65 +0,0 @@ -This package was debianized by Daniel Holbach on -Mon, 10 Oct 2005 20:50:20 +0200. - -It was downloaded from http://tango.freedesktop.org/releases/ - -Upstream Authors: 2005-2009 - - Ulisse Perusin - Steven Garrity - Lapo Calamandrei - Ryan Collier - Rodney Dawes - Andreas Nilsson - Tuomas Kuosmanen - Garrett LeSage - Jakub Steiner - -Copyright: - - In the preparation of the 0.8.90 release Novell took care of tracking - down all the contributors to get them to relicense their artwork - into Public Domain. - - The COPYING file of the tarball states the following: - | The icons in this repository are herefore released into the Public Domain. - - Additionally the copyright status of the files was tracked in the CVS and the - rdf properties of the SVGs adjusted for all files that were put into Public - Domain (see rdf:about and rdf:resource). Both fields contain a link to the - Creative Commons Public Domain Dediciation[0] as reproduced below: - | Public Domain Dedication - | - | Copyright-Only Dedication (based on United States law) or Public Domain - | Certification - | - | The person or persons who have associated work with this document (the - | "Dedicator" or "Certifier") hereby either (a) certifies that, to the best - | of his knowledge, the work of authorship identified is in the public - | domain of the country from which the work is published, or (b) - | hereby dedicates whatever copyright the dedicators holds in the work - | of authorship identified below (the "Work") to the public domain. A - | certifier, moreover, dedicates any copyright interest he may have in - | the associated work, and for these purposes, is described as a - | "dedicator" below. - | - | A certifier has taken reasonable steps to verify the copyright - | status of this work. Certifier recognizes that his good faith efforts - | may not shield him from liability if in fact the work certified is not - | in the public domain. - | - | Dedicator makes this dedication for the benefit of the public at - | large and to the detriment of the Dedicator's heirs and successors. - | Dedicator intends this dedication to be an overt act of relinquishment - | in perpetuity of all present and future rights under copyright law, - | whether vested or contingent, in the Work. Dedicator understands that - | such relinquishment of all rights includes the relinquishment of all - | rights to enforce (by lawsuit or otherwise) those copyrights in the - | Work. - | - | Dedicator recognizes that, once placed in the public domain, the Work - | may be freely reproduced, distributed, transmitted, used, modified, - | built upon, or otherwise exploited by anyone for any purpose, commercial - | or non-commercial, and in any way, including by methods that have not - | yet been invented or conceived. - [0] http://creativecommons.org/licenses/publicdomain/ diff --git a/components/onlinepackagemanager/images/ImageCopyright.txt b/components/onlinepackagemanager/images/ImageCopyright.txt deleted file mode 100644 index 3fa26e7c09..0000000000 --- a/components/onlinepackagemanager/images/ImageCopyright.txt +++ /dev/null @@ -1,23 +0,0 @@ -1. Name: Free-icons - WebPage: http://www.aha-soft.com/free-icons/ - License: Creative Commons Attribution-Share Alike 3.0 -2. Name: Tango-icon-theme - WebPage: http://http.debian.net/debian/pool/main/t/tango-icon-theme/tango-icon-theme_0.8.90.orig.tar.gz - License: See Copyright.txt -3. Name: Led icon-set - WebPage: http://led24.de/iconset/ - License: See 1license.txt, readme.txt -4. Name: FamFamFam - Author: Mark James - WebPage: http://www.famfamfam.com/lab/icons/mini/ - License: Free use for any purpose -5. Name: Fugue Icons - Author: Yusuke Kamiyamane - WebPage: http://p.yusukekamiyamane.com/ - License: Creative Commons Attribution 3.0 License - - - - -magnifier-minus.png --> Fugue Icons -magnifier-plus.png --> Fugue Icons \ No newline at end of file diff --git a/components/onlinepackagemanager/images/readme.txt b/components/onlinepackagemanager/images/readme.txt index 3adbb5a1b9..b42a9b8acd 100644 --- a/components/onlinepackagemanager/images/readme.txt +++ b/components/onlinepackagemanager/images/readme.txt @@ -1,5 +1 @@ -You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to -http://led24.de/iconset/ or http://led24.de/ would be appreciated. - -Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com -512 icons 20/05/2009 \ No newline at end of file +Icons, images designed by Roland Hahn. \ No newline at end of file diff --git a/components/onlinepackagemanager/opkman_const.pas b/components/onlinepackagemanager/opkman_const.pas index 65c7f9a45f..5485ca2ab0 100644 --- a/components/onlinepackagemanager/opkman_const.pas +++ b/components/onlinepackagemanager/opkman_const.pas @@ -142,6 +142,7 @@ resourcestring rsMainFrm_cbAll_Hint = 'Check/Uncheck packages'; rsMainFrm_lbFilter_Caption = 'Filter by:'; rsMainFrm_cbFilterBy_Hint = 'Filter package list by:'; + rsMainFrm_bReturn_Caption = 'Return'; rsMainFrm_edFilter_Hint = 'Type filter text'; rsMainFrm_spClear_Hint = 'Clear filter text'; rsMainFrm_spExpand_Hint = 'Expand package tree'; diff --git a/components/onlinepackagemanager/opkman_contributors.txt b/components/onlinepackagemanager/opkman_contributors.txt index 8fc7e76fb7..e39d12af87 100644 --- a/components/onlinepackagemanager/opkman_contributors.txt +++ b/components/onlinepackagemanager/opkman_contributors.txt @@ -9,4 +9,5 @@ P Seppo Suutarla Swen Heinig varianus -Werner Pamler \ No newline at end of file +Werner Pamler +Roland Hahn \ No newline at end of file diff --git a/components/onlinepackagemanager/opkman_mainfrm.lfm b/components/onlinepackagemanager/opkman_mainfrm.lfm index 752bf28154..a80491dd73 100644 --- a/components/onlinepackagemanager/opkman_mainfrm.lfm +++ b/components/onlinepackagemanager/opkman_mainfrm.lfm @@ -358,6 +358,7 @@ object MainFrm: TMainFrm Top = 60 Width = 900 Align = alTop + BevelOuter = bvNone ClientHeight = 0 ClientWidth = 900 Color = clBtnFace diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas index de245e8953..c560672e1b 100644 --- a/components/onlinepackagemanager/opkman_mainfrm.pas +++ b/components/onlinepackagemanager/opkman_mainfrm.pas @@ -1400,7 +1400,7 @@ begin lbFilterBy.Top := cbFilterBy.Top + (cbFilterBy.Height - lbFilterBy.Height) div 2; lbFilterBy.Caption := rsMainFrm_lbFilter_Caption; cbFilterBy.Hint := rsMainFrm_cbFilterBy_Hint; - + bReturn.Caption := rsMainFrm_bReturn_Caption; cbPackageCategory.Visible := False; cbPackageType.Visible := False; cbPackageState.Visible := False; diff --git a/components/onlinepackagemanager/opkman_updates.pas b/components/onlinepackagemanager/opkman_updates.pas index da5366fb9e..8d59d7c189 100644 --- a/components/onlinepackagemanager/opkman_updates.pas +++ b/components/onlinepackagemanager/opkman_updates.pas @@ -470,7 +470,7 @@ begin Result := Assigned(SerializablePackages) and (FOpenSSLAvailable) and (not FBusyUpdating) and (not FNeedToBreak); case Options.CheckForUpdates of - 0: Result := MinutesBetween(Now, Options.LastUpdate) >= 2; + 0: Result := MinutesBetween(Now, Options.LastUpdate) >= 15; 1: Result := HoursBetween(Now, Options.LastUpdate) >= 1; 2: Result := DaysBetween(Now, Options.LastUpdate) >= 1; 3: Result := WeeksBetween(Now, Options.LastUpdate) >= 1; diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas index 776e7ad0c9..9ee2a5fe4f 100644 --- a/components/onlinepackagemanager/opkman_visualtree.pas +++ b/components/onlinepackagemanager/opkman_visualtree.pas @@ -660,8 +660,6 @@ var var I: Integer; begin - if AStartIndex + ATyp > 25 then - ShowMessage('crap'); for I := 0 to ACnt - 1 do imgres.Draw(ACanvas, AX + I*AWidth + 5, AY, AStartIndex + ATyp); end;