Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2013-09-07 07:33:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2013-08-23 12:02:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2013-09-07 07:33:59.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 5 17:47:57 UTC 2013 - [email protected] + +- Added konqueror-fix-bookmarks-in-toolbar.diff: + * Fix toplevel bookmarks not showing in toolbar + +------------------------------------------------------------------- +Sun Sep 1 09:57:00 UTC 2013 - [email protected] + +- Update to 4.11.1 + * KDE 4.11.1 bugfix release + * See http://www.kde.org/announcements/announce-4.11.1.php + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.11.0.tar.xz New: ---- kde-baseapps-4.11.1.tar.xz konqueror-fix-bookmarks-in-toolbar.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.xAG5Wl/_old 2013-09-07 07:34:00.000000000 +0200 +++ /var/tmp/diff_new_pack.xAG5Wl/_new 2013-09-07 07:34:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.11.0 +Version: 4.11.1 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ @@ -30,6 +30,8 @@ Patch1: dolphin-go_up.diff # PATCH-FIX-OPENSUSE folderview_align_to_grid_true.diff (created by Christian Trippe to make icon set to align the default in folderview bnc#327502) Patch2: folderview_align_to_grid_true.diff +# PATCH-FIX-UPSTREAM konqueror-fix-bookmarks-in-toolbar.diff -- Fix toplevel bookmarks not showing in toolbar, regression from d1963e23 +Patch3: konqueror-fix-bookmarks-in-toolbar.diff BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %{version} @@ -50,6 +52,7 @@ %setup -q -n kde-baseapps-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake_kde4 -d build ++++++ kde-baseapps-4.11.0.tar.xz -> kde-baseapps-4.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/doc/dolphin/index.docbook new/kde-baseapps-4.11.1/doc/dolphin/index.docbook --- old/kde-baseapps-4.11.0/doc/dolphin/index.docbook 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/doc/dolphin/index.docbook 2013-08-28 19:00:18.000000000 +0200 @@ -103,7 +103,7 @@ </para> <para> -This development approach allows for concentrating on optimizing the user +This design approach allows the developers to concentrate on optimizing the user interface for the specific task of file management. </para> @@ -166,7 +166,7 @@ </textobject> <caption> <para> -Toolbar items where the icon is sufficient for knowing the command do not have a text +Toolbar items where the icon is sufficient for knowing the command do not have text alongside the icons. This can be changed by a &RMB; click and selecting the item text below <guilabel>Show Text</guilabel>. The <guibutton>Control</guibutton> button at the right side of the toolbar is only displayed if the menubar is hidden. @@ -193,14 +193,14 @@ </para> <para>If desktop search and file indexing are enabled in the <guilabel>Desktop Search</guilabel> module in the &systemsettings; the panel provides <guilabel>Recently Accessed</guilabel> -items and allows to search for <guilabel>Documents</guilabel>, <guilabel>Images</guilabel>, +items and allows you to search for <guilabel>Documents</guilabel>, <guilabel>Images</guilabel>, <guilabel>Audio Files</guilabel> and <guilabel>Video</guilabel>. </para></listitem> <listitem><para> The status bar. It displays the name, size and type of the file which is -currently hovered with the mouse, or the number and size of the files which are -selected. At the right, there is a zoom slider that permits to adjust the size +currently hovered over with the mouse, or the number and size of the files which are +selected. At the right, there is a zoom slider that allows you to adjust the size of the icons in the view. </para></listitem> @@ -257,7 +257,7 @@ be dragged and dropped in another folder in the current view or in another &dolphin; view (in another &dolphin; window or in the same window if the view is split, see below) to move or copy it or to create a symbolic link. -Items can even be dropped in another application to open them in this application. +Items can even be dropped in another application to open them in that application. </para></listitem> </itemizedlist> @@ -309,8 +309,8 @@ </screenshot> <para> -All the settings discussed below and other options concerning, ⪚, the -sorting of the files in the current folder can also be modified in the +All the settings discussed below and other options concerning, ⪚ the +sorting of the files in the current folder, can also be modified in the <guimenu>View</guimenu> menu and in the <link linkend="view-properties-dialog">View Properties dialog</link>. By default, these settings are remembered for each folder separately. This @@ -330,8 +330,8 @@ <listitem><para> In the <guibutton>Icons</guibutton> view, which is the default, files will be represented by an icon that visualizes the file type, and a folder icon will be -shown for subfolders. The names of folders and files and the items enabled in -<menuchoice><guimenu>View</guimenu><guisubmenu>Additional Information</guisubmenu></menuchoice> +shown for subfolders. The names of folders and files, and the items enabled in +<menuchoice><guimenu>View</guimenu><guisubmenu>Additional Information</guisubmenu></menuchoice>, are displayed below the icons. </para></listitem> @@ -358,11 +358,11 @@ the <guilabel>Name</guilabel> header, which is always the first column in this view. </para> <para> -The details view permits to view the current directory +The details view allows you to view the current directory in a tree-like fashion if <link linkend="preferences-dialog-viewmodes-details"> <guilabel>Expandable folders</guilabel></link> are enabled: Each subfolder of the current folder can be -<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon><</guiicon> +<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>></guiicon> or <guiicon>v</guiicon> icon next to it.</para></listitem> </itemizedlist> </para> @@ -387,7 +387,7 @@ <sect3 id="dolphin-view-information"> <title>Information in the View</title> <para> -In all view modes &dolphin; shows at least an icon and a name for each item. +In all view modes &kappname; shows at least an icon and a name for each item. Using <guisubmenu>Additional Information</guisubmenu> in the <guimenu>View</guimenu> menu or the context menu of the header in <guilabel>Details</guilabel> mode, you can select more information for each item to be shown: @@ -399,7 +399,7 @@ <guimenuitem>Tags</guimenuitem> or <guimenuitem>Comment</guimenuitem>. </para> -<para>Depending on the file type additionally sorting criteria can be selected: +<para>Depending on the file type, additionally, sorting criteria can be selected: <simplelist> <member><guimenuitem>Document</guimenuitem>: Number of words and lines</member> <member><guimenuitem>Image</guimenuitem>: Size and orientation</member> @@ -407,7 +407,7 @@ </simplelist> </para> -<para>The <guisubmenu>Other</guisubmenu> submenu allows to select +<para>The <guisubmenu>Other</guisubmenu> submenu allows you to select <guimenuitem>Path</guimenuitem>, <guimenuitem>Link Destination</guimenuitem>, <guimenuitem>Copied From</guimenuitem>, <guimenuitem>Permissions</guimenuitem>, <guimenuitem>Owner</guimenuitem> or @@ -421,7 +421,7 @@ <para> If <guibutton>Preview</guibutton> is enabled, the icons are based on the actual -file or folder contents. E.g., for images a scaled down preview of the image is +file or folder contents; ⪚ for images a scaled down preview of the image is shown. </para> @@ -481,7 +481,7 @@ <link linkend="preferences-dialog-general-behavior"><quote>Behavior</quote> tab of the <guilabel>General</guilabel> section of the settings</link>, a small <guiicon>+</guiicon> or <guiicon>-</guiicon> button appears in the top -left corner of the item which is currently hovered with the mouse. Clicking +left corner of the item which is currently hovered over with the mouse. Clicking this sign selects or deselects the item, respectively. </para></listitem> @@ -546,7 +546,7 @@ <title>Location Bar</title> <para> -The location bar, which can be found on top of &dolphin;'s view, displays +The location bar, which can be found above &dolphin;'s view, displays the path to the current folder. The location bar has two modes. </para> @@ -557,7 +557,7 @@ In the <quote>bread crumb</quote> mode, which is the default, each folder name in the path to the current folder is a button which can be clicked to quickly open that folder. Moreover, clicking the <quote>></quote> sign to the right of a -folder opens a menu which permits to quickly open a subfolder of that folder. +folder opens a menu which allows you to quickly open a subfolder of that folder. </para> <screenshot> @@ -579,7 +579,7 @@ <title>Editable Mode</title> <para> -When in bread crumb mode, clicking in the grey area to the right of the path +When in bread crumb mode, clicking in the gray area to the right of the path with the &LMB; switches the location bar to the <quote>editable</quote> mode, in which the path can be edited using the keyboard. To switch back to bread crumb mode, click the check mark at the right of the location bar with the &LMB;. @@ -625,7 +625,7 @@ </mediaobject> </screenshot> -<para>The context menu of the location bar offers action to switch between the modes and +<para>The context menu of the location bar offers actions to switch between the modes and to copy and paste the path using the clipboard. Check the last option in this context menu to display either the full path starting with the root folder of the file system or to display the path starting with the current places entry. @@ -666,7 +666,7 @@ The <guilabel>Places</guilabel> panel is located at the left of the window by default. The <guilabel>Places</guilabel> panel shows any locations you have bookmarked. It also shows any disk or media attached to the computer, recently accessed items -and allows to search for certain type of files. The order of these entries can be changed by drag and drop. +and allows you to search for certain type of files. The order of these entries can be changed by drag and drop. </para> <para> @@ -683,7 +683,7 @@ and change the icon size to one of the predefined values or lock/unlock the panels. </para> <para>The context menu has an action to open the entry in a new tab. -Devices can be unmounted from the context menu. +Devices can be unmounted using the context menu. </para> </sect2> @@ -692,9 +692,9 @@ <para> The <guilabel>Information</guilabel> panel shows extended information about the -selected items(s) or about of the current folder or the file which is currently hovered -with the mouse, including size, type, and date of last modification. It also -features a large preview of the selected item and permits to assign a rating, +selected items(s) or about the current folder or the file which is currently hovered +over with the mouse, including size, type, and date of last modification. It also +features a large preview of the selected item and allows you to assign a rating, tags, and comments to it. </para> @@ -739,7 +739,7 @@ <para> To quickly create a bookmark in the <guilabel>Places</guilabel> panel for the -current folder, right click in the work space and click +current folder, &RMB; click in the work space and click <menuchoice><guimenuitem>Add to Places</guimenuitem></menuchoice> in the context menu. </para> @@ -769,8 +769,8 @@ <para>The search is case insensitive, and does not require surrounding wildcards (<userinput>*foo*</userinput> and <userinput>foo</userinput> are equivalent), but you can use wildcards inside the search term. <userinput>*</userinput> will match -one or more characters, <userinput>?</userinput> only one single character.</para> -<para>This feature can be used with running nepomuk/strigi services, without these services +zero or more characters, <userinput>?</userinput> only one single character.</para> +<para>This feature can be used with running Nepomuk/Strigi services; without these services a KIOSlave is launched to provide the search results.</para> <para>The option from <guilabel>Everywhere</guilabel> with activated Nepomuk/Strigi services searches in all indexed folders, without Nepomuk/Strigi this option @@ -853,7 +853,7 @@ <para>If all file extensions in your selection are different, the name of all files can be changed without using a <userinput>#</userinput> placeholder while preserving the file extensions. This is ⪚ useful to rename a video file and all associated -subtitle files, which use to have the same filename, but different extensions. +subtitle files, which have the same filename, but different extensions. </para> </sect2> @@ -877,7 +877,7 @@ <title>Filtering Files</title> <para> -&dolphin; is capable of filtering files, &ie;, showing only those items in the +&dolphin; is capable of filtering files, &ie; showing only those items in the view whose name contains a given text. For example, if you wish to show only the <acronym>MP3</acronym> files within a folder, you could filter for <quote>.mp3</quote>. This would then filter out all files whose name does not contain <quote>.mp3</quote>. @@ -886,7 +886,7 @@ <para> To filter files, first enable the filter bar, either by pressing <keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> or via the menu: <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Show Filter Bar</guimenuitem> </menuchoice>. -You can then enter the text to be filtered in the filter bar. The filter bar can +You can then enter the text to be filtered for in the filter bar. The filter bar can be disabled either by pressing &Esc;, or with a &LMB; click on the <guiicon>Hide Filter Bar</guiicon> icon. </para> @@ -934,7 +934,7 @@ be accessed by clicking the corresponding icon on the left of the dialog. </para> -<para>All settings except from the <guilabel>Startup</guilabel> page and the <guilabel>Status Bar</guilabel> +<para>All settings except for the <guilabel>Startup</guilabel> page and the <guilabel>Status Bar</guilabel> tab on the <guilabel>General</guilabel> page are shared with &konqueror; in filemanager mode. </para> @@ -1005,7 +1005,7 @@ <para> This group contains settings which control the behavior of &dolphin;'s view modes. The three view modes (Icons, Compact, and Details) are accessible via the -tab bar on top. +tab bar at the top. <screenshot> <screeninfo>Screenshot of the Icons View settings in &dolphin;'s preferences dialog</screeninfo> @@ -1084,9 +1084,9 @@ <para> <itemizedlist> <listitem><para> -<guilabel>Expandable folders</guilabel> If checked the folder with subfolders are displayed -in a tree view where the sub items can be expanded clicking the <guiicon><</guiicon> icon -and collapsed clicking the <guiicon>v</guiicon> icon.<!--FIXME needs better wording--> +<guilabel>Expandable folders</guilabel> determines whether any folders that have subfolders +are displayed in a tree view, where the sub items can be expanded by &LMB; clicking the +<guiicon>></guiicon> icon and collapsed by clicking the <guiicon>v</guiicon> icon. </para></listitem> </itemizedlist> </para> @@ -1130,8 +1130,8 @@ <listitem><para> If <guilabel>Open folders during drag operations</guilabel> is enabled, dragging -an item with the mouse and hovering a folder with it for a short time will open -that folder. This permits to move or copy items quickly to folders which are +an item with the mouse and hovering over a folder with it for a short time will open +that folder. This allows you to move or copy items quickly to folders which are several levels deeper in the folder hierarchy. </para></listitem> @@ -1165,7 +1165,7 @@ <para> Using the <guibutton>Download New Services</guibutton> you can fetch additional -service menu. +services for the context menu. </para> <para> If you have installed &dolphin;'s plugins for <guilabel>Bazaar</guilabel>, @@ -1177,7 +1177,7 @@ context menu like commit, update, add, remove &etc; </para> <para> -In the service list it can be chosen as well if the <guimenuitem>Delete</guimenuitem>, +In the service list you can also choose if the <guimenuitem>Delete</guimenuitem>, <guimenuitem>Copy To</guimenuitem>, and <guimenuitem>Move To</guimenuitem> commands are shown in the context menu. </para> @@ -1231,7 +1231,7 @@ <para> This group contains settings which control the general behavior of &dolphin;. The group is divided further into four subgroups which can be accessed using the -tab bar on top. +tab bar at the top. <screenshot> <screeninfo>Screenshot of the General settings in &dolphin;'s preferences dialog</screeninfo> @@ -1256,18 +1256,18 @@ <itemizedlist> <listitem><para> -In the <guilabel>View</guilabel> section, it can be configured if the +In the <guilabel>View</guilabel> section, you can configure whether the <link linkend="view-properties"> view properties</link> are stored for each folder or if common view properties are to be used for all folders. </para></listitem> <listitem><para> -When hovering a file or folder with the mouse, a small window with information -about it is shown next to it if <guilabel>Show tooltips</guilabel> is enabled. +When hovering over a file or folder with the mouse, a small window with relevant +information is shown if <guilabel>Show tooltips</guilabel> is enabled. </para></listitem> <listitem><para> <guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton> -or <guibutton>-</guibutton> button above an item's icon if the item is hovered +or <guibutton>-</guibutton> button above an item's icon if the item is hovered over with the mouse. These can be used to select or deselect the item. </para></listitem> @@ -1304,7 +1304,7 @@ <title>Previews Tab</title> <para> -In this tab, it can be configured for which file types previews are shown. +In this tab, you can configure for which file types previews are shown. Moreover, the maximum size of remote files for which previews are generated can be chosen. </para> <para> @@ -1316,8 +1316,8 @@ <sect3 id="preferences-dialog-general-confirmations"> <title>Confirmations Tab</title> <para> -In the ask for confirmation section, warning dialogs which -are shown before potentially harmful actions can be enabled. +In the ask for confirmation section, you can enable warning dialogs that +are shown before potentially harmful actions . </para> <warning><para>The confirmation settings for <guilabel>Moving files or folders to trash</guilabel> and <guilabel>Deleting files or folders</guilabel> affect file operations in &dolphin;, &konqueror;, @@ -1463,7 +1463,7 @@ </menuchoice></term> <listitem><para><action>Creates a new object (such as a folder or a text file) in the current folder.</action></para> -<para>An explanation of all available objects you find in &konqueror;'s handbook in the chapter +<para>You will find an explanation of all available objects in &konqueror;'s handbook in the chapter <ulink url="help:/konqueror/making.html">Create New</ulink>.</para> </listitem> </varlistentry> @@ -1627,7 +1627,7 @@ <guimenuitem>Find...</guimenuitem> </menuchoice></term> <listitem><para><action>Opens the find bar. Enter a search term into the edit box and select to search for filename -or in contents of files starting from the current folder or from everywhere.</action></para></listitem> +or in contents of files starting from the current folder or everywhere.</action></para></listitem> </varlistentry> <varlistentry> @@ -1885,7 +1885,7 @@ <guimenu>Go</guimenu> <guimenuitem>Home</guimenuitem> </menuchoice></term> -<listitem><para><action>Changes to the users home folder, ⪚, +<listitem><para><action>Changes to the users home folder, ⪚ /home/Peter/.</action></para></listitem> </varlistentry> @@ -1942,7 +1942,7 @@ <guimenu>Tools</guimenu> <guisubmenu>Select Remote Charset</guisubmenu> </menuchoice></term> -<listitem><para><action>Offers to choose the charset used by a remote +<listitem><para><action>Allows you to choose the charset used by a remote connection manually.</action></para></listitem> </varlistentry> </variablelist> @@ -1973,9 +1973,9 @@ <answer> <para> &dolphin; is not intended to be a competitor to &konqueror;: &konqueror; acts as -universal viewer being able to show &HTML; pages, text documents, folders and a +a universal viewer being able to show &HTML; pages, text documents, folders and a lot more, whereas &dolphin; focuses on being only a file manager. This approach -allows to optimize the user interface for the task of file management. +allows the optimization of the user interface for the task of file management. </para> </answer> </qandaentry> @@ -1987,10 +1987,10 @@ <answer> <para> The easiest way to get involved with &dolphin; is to subscribe to the developer -mailinglist <ulink url="https://mail.kde.org/mailman/listinfo/kfm-devel";>kfm-devel</ulink> -and drop an email to the developer mailing list. Email, what you can do, how much time +mailing list <ulink url="https://mail.kde.org/mailman/listinfo/kfm-devel";>kfm-devel</ulink> +and drop an email to the developer mailing list. Email what you can do, how much time you can devote &etc;, the developers will let you know what you can do in the -project. If you wish to contribute to the documentation please mail to the +project. If you wish to contribute to the documentation please email the <ulink url="mailto:[email protected]";>&kde; Documentation Team</ulink> list. </para> </answer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/doc/konqueror/index.docbook new/kde-baseapps-4.11.1/doc/konqueror/index.docbook --- old/kde-baseapps-4.11.0/doc/konqueror/index.docbook 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/doc/konqueror/index.docbook 2013-08-28 19:00:18.000000000 +0200 @@ -536,8 +536,8 @@ <listitem><para> In the <guibutton>Icons</guibutton> view, which is the default, files will be represented by an icon that visualizes the file type, and a folder icon will be -shown for subfolders. The names of folders and files and the items enabled in -<menuchoice><guimenu>View</guimenu><guisubmenu>Additional Information</guisubmenu></menuchoice> +shown for subfolders. The names of folders and files, and the items enabled in +<menuchoice><guimenu>View</guimenu><guisubmenu>Additional Information</guisubmenu></menuchoice>, are displayed below the icons. </para></listitem> @@ -564,10 +564,10 @@ the <guilabel>Name</guilabel> header, which is always the first column in this view. </para> <para> -The details view permits to view the current directory in a tree-like fashion if +The details view allows you to view the current directory in a tree-like fashion if <guilabel>Expandable folders</guilabel> are enabled: Each subfolder of the current folder can be -<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon><</guiicon> +<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>></guiicon> or <guiicon>v</guiicon> icon next to it.</para></listitem> </itemizedlist> @@ -626,7 +626,7 @@ <guimenuitem>Tags</guimenuitem> or <guimenuitem>Comment</guimenuitem>. </para> -<para>Depending on the file type additionally sorting criteria can be selected: +<para>Depending on the file type, additionally, sorting criteria can be selected: <simplelist> <member><guimenuitem>Document</guimenuitem>: Number of words and lines</member> <member><guimenuitem>Image</guimenuitem>: Size and orientation</member> @@ -1092,7 +1092,7 @@ <guilabel>Behavior</guilabel> tab of the <menuchoice><guimenu>File Management</guimenu> <guimenuitem>General</guimenuitem></menuchoice> section of the settings, a small <guiicon>+</guiicon> or <guiicon>-</guiicon> button appears in the top -left corner of the item which is currently hovered with the mouse. Clicking +left corner of the item which is currently hovered over with the mouse. Clicking this sign selects or deselects the item, respectively. </para></listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kfileitemmodel.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kfileitemmodel.cpp 2013-08-06 14:44:05.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodel.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -192,8 +192,30 @@ emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); - if (changedRoles.contains(sortRole())) { - m_resortAllItemsTimer->start(); + // Trigger a resorting if the item's correct position has changed. Note + // that this can happen even if the sort role has not changed at all + // because the file name can be used as a fallback. + if (changedRoles.contains(sortRole()) || changedRoles.contains(roleForType(NameRole))) { + // Compare the changed item with its neighbors to see + // if an expensive resorting is needed at all. + const ItemData* changedItem = m_itemData.at(index); + const ItemData* previousItem = (index == 0) ? 0 : m_itemData.at(index - 1); + const ItemData* nextItem = (index == m_itemData.count() - 1) ? 0 : m_itemData.at(index + 1); + + if ((previousItem && lessThan(changedItem, previousItem)) + || (nextItem && lessThan(nextItem, changedItem))) { + m_resortAllItemsTimer->start(); + } else if (groupedSorting() && changedRoles.contains(sortRole())) { + // The position is still correct, but the groups might have changed + // if the changed item is either the first or the last item in a + // group. + // In principle, we could try to find out if the item really is the + // first or last one in its group and then update the groups + // (possibly with a delayed timer to make sure that we don't + // re-calculate the groups very often if items are updated one by + // one), but starting m_resortAllItemsTimer is easier. + m_resortAllItemsTimer->start(); + } } return true; @@ -926,7 +948,7 @@ emit itemsChanged(itemRangeList, changedRoles); if (changedRoles.contains(sortRole())) { - resortAllItems(); + m_resortAllItemsTimer->start(); } } @@ -1275,25 +1297,20 @@ data.insert(sharedValue("url"), item.url()); const bool isDir = item.isDir(); - if (m_requestRole[IsDirRole]) { - data.insert(sharedValue("isDir"), isDir); + if (m_requestRole[IsDirRole] && isDir) { + data.insert(sharedValue("isDir"), true); } - if (m_requestRole[IsLinkRole]) { - const bool isLink = item.isLink(); - data.insert(sharedValue("isLink"), isLink); + if (m_requestRole[IsLinkRole] && item.isLink()) { + data.insert(sharedValue("isLink"), true); } if (m_requestRole[NameRole]) { data.insert(sharedValue("text"), item.text()); } - if (m_requestRole[SizeRole]) { - if (isDir) { - data.insert(sharedValue("size"), QVariant()); - } else { - data.insert(sharedValue("size"), item.size()); - } + if (m_requestRole[SizeRole] && !isDir) { + data.insert(sharedValue("size"), item.size()); } if (m_requestRole[DateRole]) { @@ -1347,17 +1364,15 @@ data.insert(sharedValue("path"), path); } - if (m_requestRole[IsExpandableRole]) { - data.insert(sharedValue("isExpandable"), item.isDir()); + if (m_requestRole[IsExpandableRole] && isDir) { + data.insert(sharedValue("isExpandable"), true); } if (m_requestRole[ExpandedParentsCountRole]) { - int level = 0; if (parent) { - level = parent->values["expandedParentsCount"].toInt() + 1; + const int level = parent->values["expandedParentsCount"].toInt() + 1; + data.insert(sharedValue("expandedParentsCount"), level); } - - data.insert(sharedValue("expandedParentsCount"), level); } if (item.isMimeTypeKnown()) { @@ -1366,6 +1381,9 @@ if (m_requestRole[TypeRole]) { data.insert(sharedValue("type"), item.mimeComment()); } + } else if (m_requestRole[TypeRole] && isDir) { + static const QString folderMimeType = item.mimeComment(); + data.insert(sharedValue("type"), folderMimeType); } return data; @@ -1972,7 +1990,15 @@ QElapsedTimer timer; timer.start(); foreach (const KFileItem& item, items) { // krazy:exclude=foreach - item.determineMimeType(); + // Only determine mime types for files here. For directories, + // KFileItem::determineMimeType() reads the .directory file inside to + // load the icon, but this is not necessary at all if we just need the + // type. Some special code for setting the correct mime type for + // directories is in retrieveData(). + if (!item.isDir()) { + item.determineMimeType(); + } + if (timer.elapsed() > timeout) { // Don't block the user interface, let the remaining items // be resolved asynchronously. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2013-07-23 10:58:57.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -570,6 +570,22 @@ } QHash<QByteArray, QVariant> data = rolesData(item); + + const QStringList overlays = data["iconOverlays"].toStringList(); + // Strangely KFileItem::overlays() returns empty string-values, so + // we need to check first whether an overlay must be drawn at all. + // It is more efficient to do it here, as KIconLoader::drawOverlays() + // assumes that an overlay will be drawn and has some additional + // setup time. + foreach (const QString& overlay, overlays) { + if (!overlay.isEmpty()) { + // There is at least one overlay, draw all overlays above m_pixmap + // and cancel the check + KIconLoader::global()->drawOverlays(overlays, scaledPixmap, KIconLoader::Desktop); + break; + } + } + data.insert("iconPixmap", scaledPixmap); disconnect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kitemlistview.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistview.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kitemlistview.cpp 2013-08-06 14:44:05.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistview.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -1237,8 +1237,10 @@ if (m_grouped) { updateGroupHeaderHeight(); } else { - // Clear all visible headers - QMutableHashIterator<KItemListWidget*, KItemListGroupHeader*> it (m_visibleGroups); + // Clear all visible headers. Note that the QHashIterator takes a copy of + // m_visibleGroups. Therefore, it remains valid even if items are removed + // from m_visibleGroups in recycleGroupHeaderForWidget(). + QHashIterator<KItemListWidget*, KItemListGroupHeader*> it(m_visibleGroups); while (it.hasNext()) { it.next(); recycleGroupHeaderForWidget(it.key()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kitemlistwidget.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistwidget.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kitemlistwidget.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kitemlistwidget.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -451,6 +451,12 @@ { QGraphicsWidget::resizeEvent(event); clearHoverCache(); + + if (m_selectionToggle) { + const QRectF& toggleRect = selectionToggleRect(); + m_selectionToggle->setPos(toggleRect.topLeft()); + m_selectionToggle->resize(toggleRect.size()); + } } qreal KItemListWidget::hoverOpacity() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kstandarditemlistwidget.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -204,8 +204,13 @@ qDeleteAll(m_textInfo); m_textInfo.clear(); - delete m_roleEditor; - delete m_oldRoleEditor; + if (m_roleEditor) { + m_roleEditor->deleteLater(); + } + + if (m_oldRoleEditor) { + m_oldRoleEditor->deleteLater(); + } } void KStandardItemListWidget::setLayout(Layout layout) @@ -649,16 +654,15 @@ this, SLOT(slotRoleEditingCanceled(QByteArray,QVariant))); disconnect(m_roleEditor, SIGNAL(roleEditingFinished(QByteArray,QVariant)), this, SLOT(slotRoleEditingFinished(QByteArray,QVariant))); + + if (m_oldRoleEditor) { + m_oldRoleEditor->deleteLater(); + } m_oldRoleEditor = m_roleEditor; m_roleEditor->hide(); m_roleEditor = 0; } return; - } else if (m_oldRoleEditor) { - // Delete the old editor before constructing the new one to - // prevent a memory leak. - m_oldRoleEditor->deleteLater(); - m_oldRoleEditor = 0; } Q_ASSERT(!m_roleEditor); @@ -791,7 +795,6 @@ { if (m_supportsItemExpanding) { const QHash<QByteArray, QVariant> values = data(); - Q_ASSERT(values.contains("expandedParentsCount")); const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt(); if (expandedParentsCount >= 0) { const qreal widgetHeight = size().height(); @@ -839,29 +842,14 @@ // use a generic icon as fallback iconName = QLatin1String("unknown"); } - m_pixmap = pixmapForIcon(iconName, maxIconHeight); + const QStringList overlays = values["iconOverlays"].toStringList(); + m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight); } else if (m_pixmap.width() != maxIconWidth || m_pixmap.height() != maxIconHeight) { // A custom pixmap has been applied. Assure that the pixmap // is scaled to the maximum available size. KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight)); } - const QStringList overlays = values["iconOverlays"].toStringList(); - - // Strangely KFileItem::overlays() returns empty string-values, so - // we need to check first whether an overlay must be drawn at all. - // It is more efficient to do it here, as KIconLoader::drawOverlays() - // assumes that an overlay will be drawn and has some additional - // setup time. - foreach (const QString& overlay, overlays) { - if (!overlay.isEmpty()) { - // There is at least one overlay, draw all overlays above m_pixmap - // and cancel the check - KIconLoader::global()->drawOverlays(overlays, m_pixmap, KIconLoader::Desktop); - break; - } - } - if (m_isCut) { KIconEffect* effect = KIconLoader::global()->iconEffect(); m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); @@ -1042,12 +1030,15 @@ const int textLength = line.textStart() + line.textLength(); if (textLength < nameText.length()) { // Elide the last line of the text - QString lastTextLine = nameText.mid(line.textStart(), line.textLength()); + QString lastTextLine = nameText.mid(line.textStart()); lastTextLine = m_customizedFontMetrics.elidedText(lastTextLine, Qt::ElideRight, - line.naturalTextWidth() - 1); + maxWidth); const QString elidedText = nameText.left(line.textStart()) + lastTextLine; nameTextInfo->staticText.setText(elidedText); + + const qreal lastLineWidth = m_customizedFontMetrics.boundingRect(lastTextLine).width(); + nameWidth = qMax(nameWidth, lastLineWidth); } break; } @@ -1318,14 +1309,17 @@ scene()->views()[0]->parentWidget()->setFocus(); } + if (m_oldRoleEditor) { + m_oldRoleEditor->deleteLater(); + } m_oldRoleEditor = m_roleEditor; m_roleEditor->hide(); m_roleEditor = 0; } -QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, int size) +QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size) { - const QString key = "KStandardItemListWidget:" % name % ":" % QString::number(size); + const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(":") % ":" % QString::number(size); QPixmap pixmap; if (!QPixmapCache::find(key, pixmap)) { @@ -1355,6 +1349,20 @@ KPixmapModifier::scale(pixmap, QSize(size, size)); } + // Strangely KFileItem::overlays() returns empty string-values, so + // we need to check first whether an overlay must be drawn at all. + // It is more efficient to do it here, as KIconLoader::drawOverlays() + // assumes that an overlay will be drawn and has some additional + // setup time. + foreach (const QString& overlay, overlays) { + if (!overlay.isEmpty()) { + // There is at least one overlay, draw all overlays above m_pixmap + // and cancel the check + KIconLoader::global()->drawOverlays(overlays, pixmap, KIconLoader::Desktop); + break; + } + } + QPixmapCache::insert(key, pixmap); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kstandarditemlistwidget.h new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kstandarditemlistwidget.h --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/kstandarditemlistwidget.h 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/kstandarditemlistwidget.h 2013-08-28 19:00:18.000000000 +0200 @@ -186,7 +186,7 @@ */ void closeRoleEditor(); - static QPixmap pixmapForIcon(const QString& name, int size); + static QPixmap pixmapForIcon(const QString& name, const QStringList& overlays, int size); /** * @return Preferred size of the rating-image based on the given diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -93,6 +93,22 @@ emitRoleEditingFinished(); event->accept(); return; + case Qt::Key_Left: + case Qt::Key_Right: { + QTextCursor cursor = textCursor(); + if (event->modifiers() == Qt::NoModifier && cursor.hasSelection()) { + if (event->key() == Qt::Key_Left) { + cursor.setPosition(cursor.selectionStart()); + } else { + cursor.setPosition(cursor.selectionEnd()); + } + cursor.clearSelection(); + setTextCursor(cursor); + event->accept(); + return; + } + break; + } default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistselectiontoggle.cpp new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistselectiontoggle.cpp --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistselectiontoggle.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistselectiontoggle.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -79,28 +79,49 @@ m_pixmap = QPixmap(); } +void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event) +{ + QGraphicsWidget::resizeEvent(event); + + if (!m_pixmap.isNull()) { + const int pixmapSize = m_pixmap.size().width(); // Pixmap width is always equal pixmap height + + if (pixmapSize != iconSize()) { + // If the required icon size is different from the actual pixmap size, + // overwrite the m_pixmap with an empty pixmap and reload the new + // icon on next re-painting. + m_pixmap = QPixmap(); + } + } +} + void KItemListSelectionToggle::updatePixmap() { const char* icon = m_checked ? "list-remove" : "list-add"; + m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize()); + + if (m_hovered) { + KIconLoader::global()->iconEffect()->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState); + } +} + +int KItemListSelectionToggle::iconSize() const +{ + const int iconSize = qMin(size().width(), size().height()); - int iconSize = qMin(size().width(), size().height()); if (iconSize < KIconLoader::SizeSmallMedium) { - iconSize = KIconLoader::SizeSmall; + return KIconLoader::SizeSmall; } else if (iconSize < KIconLoader::SizeMedium) { - iconSize = KIconLoader::SizeSmallMedium; + return KIconLoader::SizeSmallMedium; } else if (iconSize < KIconLoader::SizeLarge) { - iconSize = KIconLoader::SizeMedium; + return KIconLoader::SizeMedium; } else if (iconSize < KIconLoader::SizeHuge) { - iconSize = KIconLoader::SizeLarge; + return KIconLoader::SizeLarge; } else if (iconSize < KIconLoader::SizeEnormous) { - iconSize = KIconLoader::SizeHuge; + return KIconLoader::SizeHuge; } - m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize); - - if (m_hovered) { - KIconLoader::global()->iconEffect()->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState); - } + return iconSize; } #include "kitemlistselectiontoggle.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistselectiontoggle.h new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistselectiontoggle.h --- old/kde-baseapps-4.11.0/dolphin/src/kitemviews/private/kitemlistselectiontoggle.h 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/kitemviews/private/kitemlistselectiontoggle.h 2013-08-28 19:00:18.000000000 +0200 @@ -46,9 +46,11 @@ protected: virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event); virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event); + virtual void resizeEvent(QGraphicsSceneResizeEvent* event); private: void updatePixmap(); + int iconSize() const; private: bool m_checked; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/panels/places/placesitem.cpp new/kde-baseapps-4.11.1/dolphin/src/panels/places/placesitem.cpp --- old/kde-baseapps-4.11.0/dolphin/src/panels/places/placesitem.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/panels/places/placesitem.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -270,8 +270,13 @@ QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)), m_signalHandler, SLOT(onAccessibilityChanged())); } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { - const QString device = m_device.as<Solid::Block>()->device(); - setUrl(QString("audiocd:/?device=%1").arg(device)); + Solid::Block *block = m_device.as<Solid::Block>(); + if (block) { + const QString device = block->device(); + setUrl(QString("audiocd:/?device=%1").arg(device)); + } else { + setUrl(QString("audiocd:/")); + } } else if (m_mtp) { setUrl(QString("mtp:udi=%1").arg(m_device.udi())); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/dolphin/src/tests/kfileitemmodeltest.cpp new/kde-baseapps-4.11.1/dolphin/src/tests/kfileitemmodeltest.cpp --- old/kde-baseapps-4.11.0/dolphin/src/tests/kfileitemmodeltest.cpp 2013-08-06 14:44:05.000000000 +0200 +++ new/kde-baseapps-4.11.1/dolphin/src/tests/kfileitemmodeltest.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -70,6 +70,7 @@ void testSetDataWithModifiedSortRole_data(); void testSetDataWithModifiedSortRole(); void testChangeSortRole(); + void testResortAfterChangingName(); void testModelConsistencyWhenInsertingItems(); void testItemRangeConsistencyWhenInsertingItems(); void testExpandItems(); @@ -368,6 +369,30 @@ QVERIFY(ok1 || ok2); } +void KFileItemModelTest::testResortAfterChangingName() +{ + // We sort by size in a directory where all files have the same size. + // Therefore, the files are sorted by their names. + m_model->setSortRole("size"); + + QStringList files; + files << "a.txt" << "b.txt" << "c.txt"; + m_testDir->createFiles(files); + + m_model->loadDirectory(m_testDir->url()); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt"); + + // We rename a.txt to d.txt. Even though the size has not changed at all, + // the model must re-sort the items. + QHash<QByteArray, QVariant> data; + data.insert("text", "d.txt"); + m_model->setData(0, data); + + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "b.txt" << "c.txt" << "d.txt"); +} + void KFileItemModelTest::testModelConsistencyWhenInsertingItems() { //QSKIP("Temporary disabled", SkipSingle); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.11.0/konqueror/src/konqbookmarkbar.cpp new/kde-baseapps-4.11.1/konqueror/src/konqbookmarkbar.cpp --- old/kde-baseapps-4.11.0/konqueror/src/konqbookmarkbar.cpp 2013-07-10 00:48:35.000000000 +0200 +++ new/kde-baseapps-4.11.1/konqueror/src/konqbookmarkbar.cpp 2013-08-28 19:00:18.000000000 +0200 @@ -185,11 +185,15 @@ if (!bm.isGroup()) { if ( bm.isSeparator() ) - m_toolBar->addSeparator(); + if (m_toolBar) { + m_toolBar->addSeparator(); + } else { KAction *action = new KBookmarkAction( bm, m_pOwner, 0 ); - m_toolBar->addAction(action); + if (m_toolBar) { + m_toolBar->addAction(action); + } d->m_actions.append( action ); } } @@ -197,7 +201,9 @@ { KBookmarkActionMenu *action = new KBookmarkActionMenu(bm, 0); action->setDelayed( false ); - m_toolBar->addAction(action); + if (m_toolBar) { + m_toolBar->addAction(action); + } d->m_actions.append( action ); KBookmarkMenu *menu = new KonqBookmarkMenu(m_pManager, m_pOwner, action, bm.address()); m_lstSubMenus.append( menu ); ++++++ konqueror-fix-bookmarks-in-toolbar.diff ++++++ commit 43a981481ab9161a83dd200db39c093e2502f68a Author: Bernd Buschinski <[email protected]> Date: Wed Sep 4 16:23:35 2013 +0200 Fix toplevel bookmarks not showing in toolbar regression from d1963e23 diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp index 2141575..199e15f 100644 --- a/konqueror/src/konqbookmarkbar.cpp +++ b/konqueror/src/konqbookmarkbar.cpp @@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent) if (!bm.isGroup()) { - if ( bm.isSeparator() ) + if ( bm.isSeparator() ) + { if (m_toolBar) { m_toolBar->addSeparator(); } + } else { KAction *action = new KBookmarkAction( bm, m_pOwner, 0 ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
