kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
18759 commits 142 branches 326 tags 212 MiB
Commit graph

9010 commits

Author SHA1 Message Date
Frederik Schwarzer
e19cb02514 Fix typo. 2012-05-14 12:46:57 +02:00
Script Kiddy
cc7e21112a SVN_SILENT made messages (.desktop file) 2012-05-12 12:27:13 +02:00
Script Kiddy
454197fa81 SVN_SILENT made messages (.desktop file) 2012-05-11 09:39:52 +02:00
Script Kiddy
f279feed32 SVN_SILENT made messages (.desktop file) 2012-05-06 10:29:11 +02:00
Script Kiddy
4c1da6909c SVN_SILENT made messages (.desktop file) 2012-05-02 10:08:54 +02:00
Script Kiddy
43c636d5cb SVN_SILENT made messages (.desktop file) 2012-05-01 17:21:43 +02:00
Alex Fiestas
23492dd1c2 Added missing ) to make this compile again 2012-04-25 01:49:59 +02:00
Frederik Schwarzer
a35a6c8bc5 Do not patch strings that can be combined. 
REVIEW: 104712
 2012-04-24 22:33:40 +02:00
Script Kiddy
2d271e3b31 SVN_SILENT made messages (.desktop file) 2012-04-24 16:54:04 +02:00
Script Kiddy
f32af21aa9 SVN_SILENT made messages (.desktop file) 2012-04-23 10:07:32 +02:00
Script Kiddy
8426b7846f SVN_SILENT made messages (.desktop file) 2012-04-18 09:33:46 +02:00
Script Kiddy
234818d7a0 SVN_SILENT made messages (.desktop file) 2012-04-17 16:06:32 +02:00
Andrea Iacovitti
83adb9fb54 Keep default "HoverLinks" value in sync with khtml_settings's one. 
FIXED-IN: 4.8.3
 2012-04-10 22:28:36 +02:00
Stephen Kelly
909f0cd972 Add some missing includes. 
These are needed in Qt5/KF5.
 2012-04-10 00:20:22 +02:00
Stephen Kelly
ed2872074e Simplify some Qt module style includes. 
This is the easiest way to transition to Qt5.
 2012-04-10 00:20:22 +02:00
Dawit Alemayehu
feb5e54e76 Update the kded proxyscout module when the proxy settings are changed not to use PAC. 
(cherry picked from commit fdf6c1d161)
 2012-03-27 10:45:48 -04:00
Script Kiddy
b428e4be8c SVN_SILENT made messages (.desktop file) 2012-03-26 09:51:59 +02:00
Script Kiddy
b4f7084963 SVN_SILENT made messages (.desktop file) 2012-03-19 09:50:32 +01:00
Script Kiddy
9c5fdfcc70 SVN_SILENT made messages (.desktop file) 2012-03-18 10:11:44 +01:00
Dawit Alemayehu
0a2893eeb3 Removed hard dependency on khtml by using the newly added JavaScript settings 
from KParts::HtmlSettingsInterface.

Changed kcmcss to embed the default browser engine when previewing user defined
CSS settings.

CCBUG: 291277
 2012-03-17 14:01:15 -04:00
Oswald Buddenhagen
5836e113a6 adjust to INSTALLed permissions 2012-03-10 13:23:41 +01:00
Patrick Spendrin
cb2375e002 fix opening konqueror via kfmclient 
BUG:184709
(cherry picked from commit e65f0898c6)
 2012-03-06 20:03:58 +01:00
Dawit Alemayehu
fe97f31823 Always use small size icons on the status bar. 
Fixes the intermittent issue of the status bar becoming huge when the
the requested status bar icon could not be found and the default icon
is returned instead.

BUG: 294321
FIXED-IN: 4.8.1
REVIEW: 104071
(cherry picked from commit 48e804dbe4)
 2012-03-01 20:09:00 -05:00
Script Kiddy
2084d4ff1c SVN_SILENT made messages (.desktop file) 2012-02-23 09:49:23 +01:00
Dawit Alemayehu
5e627957cc Update the URL on the local KFileItem copy or else subsequent rename operations 
fail horribly.
 2012-02-20 13:16:08 -05:00
Dawit Alemayehu
fc3073b8e6 Cosmetic change: reshuffled include header order. 2012-02-20 13:10:09 -05:00
Dawit Alemayehu
22bc0951b0 Fixed logic error that prevented items in the sidebar from being refreshed correctly. 
BUG: 246738
FIXED-IN: 4.8.1

(cherry picked from commit af14f54560)
 2012-02-18 13:06:13 -05:00
Script Kiddy
6d74e9f516 SVN_SILENT made messages (.desktop file) 2012-02-16 10:49:16 +01:00
Script Kiddy
2c2bf7b1c5 SVN_SILENT made messages (.desktop file) 2012-02-07 16:46:20 +01:00
Dawit Alemayehu
e7f1c674cd Fixed Konqueror not being able to launch binary executables. 
BUG: 291044
FIXED-IN: 4.8.1
(cherry picked from commit 9aaf7490e8)
 2012-02-06 12:11:34 -05:00
Dawit Alemayehu
ab4dfb4a56 When creating a new bookmark folder, prompt for the folder name. 
BUG: 247049
FIXED-IN: 4.9.0
REVIEW: 103845
 2012-02-06 12:04:09 -05:00
Script Kiddy
7985b6d28a SVN_SILENT made messages (.desktop file) 2012-02-04 10:55:27 +01:00
Marco Martin
07d0b3fb71 Merge branch 'KDE/4.8' 
Conflicts:
	konqueror/settings/kio/proxy.desktop
 2012-02-03 15:26:27 +01:00
Script Kiddy
ed1ac4349e SVN_SILENT made messages (.desktop file) 2012-02-03 10:02:40 +01:00
Script Kiddy
b6f71b1e48 SVN_SILENT made messages (.desktop file) 2012-02-02 15:03:03 +01:00
Script Kiddy
125d89890e SVN_SILENT made messages (.desktop file) 2012-02-02 09:58:19 +01:00
Dawit Alemayehu
2cb20fcd4c Cosmetic change: Removed function name additions from debug statements. 2012-02-01 19:02:26 -05:00
Dawit Alemayehu
71a527f7a9 Cosmetic change: fixed formatting. 2012-02-01 19:02:20 -05:00
Script Kiddy
80ecef6a13 SVN_SILENT made messages (.desktop file) 2012-02-01 10:14:34 +01:00
Script Kiddy
e5c8850c67 SVN_SILENT made messages (.desktop file) 2012-01-31 21:04:40 +01:00
Script Kiddy
c63e66a139 SVN_SILENT made messages (.desktop file) 2012-01-31 16:19:58 +01:00
Script Kiddy
3a1f62622d SVN_SILENT made messages (.desktop file) 2012-01-30 11:41:21 +01:00
Script Kiddy
3f6b776571 SVN_SILENT made messages (.desktop file) 2012-01-29 11:35:27 +01:00
Dawit Alemayehu
e828d4e693 Make sure the user's preference to show or hide the close buttons takes effect 
as soon as the changes are applied. Not after restarting Konqueror.

BUG: 121792
FIXED-IN: 4.8.1
GUI: Removed portion of a tool tip text that is no longer valid.
(cherry picked from commit 2f63fe74e5)
 2012-01-29 01:46:20 -05:00
Dawit Alemayehu
2f63fe74e5 Make sure the user's preference to show or hide the close buttons takes effect 
as soon as the changes are applied. Not after restarting Konqueror.

BUG: 121792
FIXED-IN: 4.8.1
GUI: Removed portion of a tool tip text that is no longer valid.
 2012-01-29 01:44:59 -05:00
Dawit Alemayehu
92385ff425 Moving tabs causes wrong tab to be highlighted upon reload. 
BUG: 266369
FIXED-IN: 4.8.1
REVIEW: 103740
(cherry picked from commit 349264ee40)
 2012-01-27 10:43:43 -05:00
Dawit Alemayehu
349264ee40 Moving tabs causes wrong tab to be highlighted upon reload. 
BUG: 266369
FIXED-IN: 4.8.1
REVIEW: 103740
 2012-01-27 10:42:03 -05:00
Script Kiddy
89940473ca SVN_SILENT made messages (.desktop file) 2012-01-22 09:28:28 +01:00
Script Kiddy
c8bf8b77b7 SVN_SILENT made messages (.desktop file) 2012-01-17 16:33:32 +01:00
Script Kiddy
3c9ccbcca3 SVN_SILENT made messages (.desktop file) 2012-01-16 09:28:43 +01:00
Dawit Alemayehu
5a31739e6e Make sure the "Auto Detect" button is enabled when the 
"Use system proxy configuration" is selected.

Make sure users can simply click the Apply button after selecting the same
option under windows.

CCBUG: 291259
(cherry picked from commit a52df46f43)
 2012-01-13 01:17:53 -05:00
Dawit Alemayehu
a52df46f43 Make sure the "Auto Detect" button is enabled when the 
"Use system proxy configuration" is selected.

Make sure users can simply click the Apply button after selecting the same
option under windows.

CCBUG: 291259
 2012-01-13 01:17:00 -05:00
David Faure
c37d81c207 Revert this one for now, it causes bug 290936. 
I was wrong: we need to only call KRun for HTML files. Otherwise, when clicking
on a directory, kfmclient calls KRun which starts kfmclient which calls KRun...

It sounds like the only proper fix for this would be to have a KRun-derived
class in kfmclient, which gets notified of the found mimetype and can then
decide what to do. On the other hand we could also just associate the browser
app with text/html in the KCM, and use existing mechanisms instead of piling
more logic into kfmclient.

CCBUG: 182591
BUG: 290936
FIXED-IN: 4.8.0
(cherry picked from commit d882d2a5d2)
 2012-01-10 15:46:45 -05:00
Script Kiddy
fd654ca8bd SVN_SILENT made messages (.desktop file) 2012-01-10 15:50:18 +01:00
Jekyll Wu
0cc78a14df Merge remote-tracking branch 'origin/KDE/4.8' 
Conflicts:
	dolphin/src/main.cpp
 2012-01-10 20:09:21 +08:00
David Faure
d882d2a5d2 Revert this one for now, it causes bug 290936. 
I was wrong: we need to only call KRun for HTML files. Otherwise, when clicking
on a directory, kfmclient calls KRun which starts kfmclient which calls KRun...

It sounds like the only proper fix for this would be to have a KRun-derived
class in kfmclient, which gets notified of the found mimetype and can then
decide what to do. On the other hand we could also just associate the browser
app with text/html in the KCM, and use existing mechanisms instead of piling
more logic into kfmclient.

CCBUG: 182591
BUG: 290936
FIXED-IN: 4.8.0
 2012-01-10 12:12:31 +01:00
Dawit Alemayehu
261ffb5ed4 Make sure Konqueror won't crash even when the locationbar and 
hence the input combox is removed.

BUG: 172692
FIXED-IN: 4.8.1
REVIEW: 103663
(cherry picked from commit b21b16103a)
 2012-01-09 19:02:43 -05:00
Dawit Alemayehu
b21b16103a Make sure Konqueror won't crash even when the locationbar and 
hence the input combox is removed.

BUG: 172692
FIXED-IN: 4.8.1
REVIEW: 103663
 2012-01-09 18:34:24 -05:00
Script Kiddy
c069f12930 SVN_SILENT made messages (.desktop file) 2012-01-09 08:30:24 +01:00
Dawit Alemayehu
f43fa7d1c2 Make sure loading is stopped before changing embedded parts. 
BUG: 282641
FIXED-IN: 4.8.1
(cherry picked from commit 0491f27e08)
 2012-01-09 01:33:30 -05:00
Dawit Alemayehu
0491f27e08 Make sure loading is stopped before changing embedded parts. 
BUG: 282641
FIXED-IN: 4.8.1
 2012-01-09 01:32:54 -05:00
Dawit Alemayehu
b31a520282 Check m_combo for NULL before accessing it. 
BUG: 245574
FIXED-IN: 4.8.1
(cherry picked from commit 54e035f088)
 2012-01-08 23:53:13 -05:00
Dawit Alemayehu
54e035f088 Check m_combo for NULL before accessing it. 
BUG: 245574
FIXED-IN: 4.8.1
 2012-01-08 23:52:38 -05:00
Script Kiddy
f7c63d1980 SVN_SILENT made messages (.desktop file) 2012-01-06 08:38:18 +01:00
Dawit Alemayehu
3a178ebaef Save and restore the text selection. 
BUG: 147896
FIXED-IN 4.8.0
(cherry picked from commit 0379fd8b7f)
 2012-01-04 13:17:32 -05:00
Dawit Alemayehu
0379fd8b7f Save and restore the text selection. 
BUG: 147896
FIXED-IN 4.8.0
 2012-01-04 13:16:18 -05:00
Script Kiddy
839b15e4ff SVN_SILENT made messages (.desktop file) 2012-01-04 09:28:08 +01:00
Script Kiddy
b4a08a254f SVN_SILENT made messages (.desktop file) 2012-01-03 16:51:07 +01:00
Dawit Alemayehu
11f9224782 Do not show a hidden bookmark toolbar when the user modifies 
toolbar settings through the toolbar configuration dialog.
(cherry picked from commit 1dafec04f6)
 2012-01-02 13:31:26 -05:00
Dawit Alemayehu
f86eb0531a Append "-viewmode" to the view mode actions added to the action collection in 
order to avoid overwritting an existing action with the same name, e.g. konsolepart.

BUG: 266517
FIXED-IN: 4.8.0
REVIEW: 103590
(cherry picked from commit c0341d4479)
 2012-01-02 13:31:01 -05:00
Dawit Alemayehu
c0341d4479 Append "-viewmode" to the view mode actions added to the action collection in 
order to avoid overwritting an existing action with the same name, e.g. konsolepart.

BUG: 266517
FIXED-IN: 4.8.0
REVIEW: 103590
 2012-01-02 13:28:04 -05:00
Dawit Alemayehu
1dafec04f6 Do not show a hidden bookmark toolbar when the user modifies 
toolbar settings through the toolbar configuration dialog.
 2012-01-02 13:28:04 -05:00
Frederik Schwarzer
c4a73dcb7d Remove extra keyword ("proxy" is still there) 2012-01-02 04:14:58 +01:00
Dawit Alemayehu
0a1d49a830 Pass the non-interactive option to kioclient when doing exec. 
BUG:184126
FIXED-IN:4.8.0

(cherry picked from commit 8ceeefcbde)
 2011-12-28 13:19:14 -05:00
Dawit Alemayehu
fd8a97bc08 Make kfmclient use BrowserApplication for local html files too. 
NOTE: This fix requires commit c230e107 in kdelibs.

BUG: 182591
FIXED-IN: 4.8.0
REVIEW: 103524

(cherry picked from commit b7a55b9487)
 2011-12-28 13:14:31 -05:00
Dawit Alemayehu
b7a55b9487 Make kfmclient use BrowserApplication for local html files too. 
NOTE: This fix requires commit c230e107 in kdelibs.

BUG: 182591
FIXED-IN: 4.8.0
REVIEW: 103524
 2011-12-28 13:00:29 -05:00
Dawit Alemayehu
8cc2b6a854 Cosmetic change: Removed trailing whitespace from previous commit. 2011-12-23 20:14:32 -05:00
Dawit Alemayehu
8ceeefcbde Pass the non-interactive option to kioclient when doing exec. 
BUG:184126
FIXED-IN:4.8.0
 2011-12-23 20:01:39 -05:00
Script Kiddy
4c6d11516c SVN_SILENT made messages (.desktop file) 2011-12-23 10:33:39 +01:00
Script Kiddy
45412692c1 SVN_SILENT made messages (.desktop file) 2011-12-22 11:37:00 +01:00
Script Kiddy
45c96e4821 SVN_SILENT made messages (.desktop file) 2011-12-21 09:54:51 +01:00
Script Kiddy
531e666759 SVN_SILENT made messages (.desktop file) 2011-12-20 16:23:36 +01:00
David Faure
23429d77a4 Fix compilation with strict iterators 2011-12-20 12:02:49 +01:00
Dawit Alemayehu
13c832b068 Call the correct lookupItems function when deleting an item from the directory tree. 
BUG: 218180
FIXED-IN: 4.8.0
 2011-12-19 19:05:27 -05:00
Dawit Alemayehu
acbaff6a08 Do not prevent favicons from being shown for saved HTML pages. 
BUG: 105602
FIXED-IN: 4.8.0
REVIEW: 103474
 2011-12-19 15:27:18 -05:00
Dawit Alemayehu
1289bd39f5 Minor performance improvement by avoiding the use of iterator.end() 
calls inside of loop statements.

REVIEW: 103475
 2011-12-19 12:23:39 -05:00
Script Kiddy
b0e368adb5 SVN_SILENT made messages (.desktop file) 2011-12-19 15:32:33 +01:00
Script Kiddy
538bd3722d SVN_SILENT made messages (.desktop file) 2011-12-18 09:51:34 +01:00
Dawit Alemayehu
7fad5cb8dd Use the correct entry name for disabling startup notification. 2011-12-17 13:13:36 -05:00
Script Kiddy
9b71190909 SVN_SILENT made messages (.desktop file) 2011-12-17 09:44:01 +01:00
Dawit Alemayehu
d3bf6c0df9 Do not enable the "Link View" action initially. 
BUG: 244632
FIXED-IN: 4.8.0
 2011-12-15 14:07:03 -05:00
Script Kiddy
b818818790 SVN_SILENT made messages (.desktop file) 2011-12-15 09:09:04 +01:00
Dawit Alemayehu
58b38cdc04 When embedding a new part, do not try to hide the current parts' widget. 
BUG: 258278
BUG: 267215
REVIEW: 103401
FIXED-IN: 4.8.0
 2011-12-14 16:48:58 -05:00
Script Kiddy
d3b8eac2d6 SVN_SILENT made messages (.desktop file) 2011-12-13 15:50:11 +01:00
Script Kiddy
fba0fb7d89 SVN_SILENT made messages (.desktop file) 2011-12-11 08:36:39 +01:00
Script Kiddy
31270f46eb SVN_SILENT made messages (.desktop file) 2011-12-08 09:02:45 +01:00
Script Kiddy
cefad8aff9 SVN_SILENT made messages (.desktop file) 2011-12-07 09:21:22 +01:00
Script Kiddy
00f640f267 SVN_SILENT made messages (.desktop file) 2011-12-06 17:00:49 +01:00
Script Kiddy
f6b06ed0f8 SVN_SILENT made messages (.desktop file) 2011-11-29 16:47:26 +01:00
Dawit Alemayehu
258df4b69f - Save and restore invalid host name enties for manual proxy configuration. 
- Properly save and restore the display flag state for showing protocol
  in the manual proxy configuration edits.

BUG:287346
 2011-11-25 10:53:21 -05:00
Yuri Chornoivan
9ad85c44d2 Fix typo: <i;> -> <i> 2011-11-22 18:11:10 +02:00
Frederik Schwarzer
b32f443107 Fix two c&p errors and get rid of the html overhead. 2011-11-21 23:28:18 +01:00
Dawit Alemayehu
b023625fec Guard against use of NULL pointers. 
BUG: 235074
FIXED-IN: 4.7.4

(cherry picked from commit d5675e5850)
 2011-11-17 19:55:53 -05:00
Dawit Alemayehu
71f64e29a0 Check for NULL before accessing the pointer. 
BUG: 285844
FIXED-IN: 4.7.4
REVIEW: 103176

(cherry picked from commit 96901c5199)
 2011-11-17 18:23:43 -05:00
Script Kiddy
30e360ec67 SVN_SILENT made messages (.desktop file) 2011-11-16 09:29:47 +01:00
Burkhard Lück
6bf36ac0d2 fix wrong whatsThis strings in proxy kcm 
REVIEW:103131
 2011-11-15 15:08:18 +01:00
Dawit Alemayehu
959a7cf6d7 Minor cleanup 2011-11-11 21:48:29 -05:00
Albert Astals Cid
28a626cef9 hostname is domain name in this case, right? 
CCMAIL: adawit@kde.org
 2011-11-01 18:52:25 +01:00
Dawit Alemayehu
934607bda9 - Prevent KonqMisc::konqFilteredURL from reparsing _url when the filtering test fails. 
Since the filtering failure means _url is definitely invalid.

- Prevent both KonqFrameTabs::slotMouseMiddleClick functions from opening a URL when
  it is not valid or is an error URL.

BUG: 157753
FIXED-IN: 4.7.3
REVIEW: 102931
(cherry picked from commit b1b13ebbfd)
 2011-10-31 10:31:08 -04:00
Yuri Chornoivan
85654c5e24 fix typo: preceeded->preceded 2011-10-31 07:18:39 +02:00
Burkhard Lück
b840e178e0 typo fix reported by Josep Ma. Ferrer on kde-i18n-doc@kde.org 2011-10-30 17:21:10 +01:00
Christoph Feck
8f267a1401 Do not crash on empty input 
CCMAIL: adawit@kde.org
 2011-10-20 16:14:29 +02:00
Dawit Alemayehu
f90f318f21 Rewrote the proxy configuration dialog to include missing SOCKS 
proxy entry and make it much simpler to use.

BUG:82352
BUG:115704
BUG:139789
BUG:147340
BUG:164460
BUG:189019
BUG:190149
BUG:190901
BUG:205594
BUG:258196
BUG:283226
FIXED-IN:4.8

REVIEW: 102802

GUI:  Proxy configuration dialog rewrite.
 2011-10-20 02:16:04 -04:00
Dawit Alemayehu
fc0d9e485a Enable the OK button when a new policy is selected. 
CCBUG: 284297
 2011-10-18 00:56:52 -04:00
Script Kiddy
cb39ffe49a SVN_SILENT made messages (.desktop file) 2011-09-27 16:41:03 +02:00
Dawit Alemayehu
8229d6e31e Sort the cookie policy list box in ascending order. 
BUG: 282523
FIXED-IN: 4.7.2
 2011-09-26 11:37:53 -04:00
Dawit Alemayehu
c5012ab5c4 - Renamed policydlg.* to kcookiespolicyselectiondlg.* 
- Reformatted code to adhere to kde coding style.
- Cleaned up code.
 2011-09-15 13:32:27 -04:00
Dawit Alemayehu
b1cb13f556 Code clean up. 2011-09-14 12:20:33 -04:00
Dawit Alemayehu
4be09eb6a5 Corrected configuration file names. 
(cherry picked from commit 89c66b9093)
 2011-09-14 12:20:04 -04:00
Script Kiddy
932a17accc SVN_SILENT made messages (.desktop file) 2011-09-12 09:37:32 +02:00
Script Kiddy
447eb53947 SVN_SILENT made messages (.desktop file) 2011-09-09 09:18:36 +02:00
Script Kiddy
65c12b8213 SVN_SILENT made messages (.desktop file) 2011-09-08 09:00:21 +02:00
Dawit Alemayehu
9de156ef1c Do not insert a null QAction into the list since it will cause a crash in 
KXMLGuiFactory.

BUG: 280407
FIXED-IN: 4.7.1

(cherry picked from commit 42d9f4df5e)
 2011-08-24 10:23:41 -04:00
Burkhard Lück
3a35ba14e6 fix wrong tooltips for PermanentCloseButton+MiddleClickClose 
CCBUG:121792
REVIEW:101936
 2011-08-23 06:14:32 +02:00
Montel Laurent
d592f31cde normalize signals/slots 2011-07-31 13:33:56 +02:00
Script Kiddy
37247c0086 SVN_SILENT made messages (.desktop file) 2011-07-30 09:43:30 +02:00
Script Kiddy
9ff5395e22 SVN_SILENT made messages (.desktop file) 2011-07-24 09:24:14 +02:00
Marcel Partap
7c1e03ae16 Konqueror location bar: reset url to current view's actual url on ESC 
Simplest possible approach: put current view's url in address bar
 - even for corner cases like about:konqueror or about:blank
 (discussed @ https://svn.reviewboard.kde.org/r/6681 )

BUG: 257841
 2011-07-19 19:02:27 +02:00
Script Kiddy
67d4f91498 SVN_SILENT made messages (.desktop file) 2011-07-15 09:20:04 +02:00
Script Kiddy
efa7da60c2 SVN_SILENT made messages (.desktop file) 2011-07-12 10:35:32 +02:00
Script Kiddy
3126eb3e21 SVN_SILENT made messages (.desktop file) 2011-07-11 10:55:04 +02:00
Script Kiddy
e4004ac126 SVN_SILENT made messages (.desktop file) 2011-07-06 10:40:22 +02:00
Dawit Alemayehu
784e0106b8 Fixed deprecated warning message by replacing: 
QClipboard::setData -> QClipboard::setMimeData
QClipboard::data -> QClipboard::mimeData
 2011-07-03 16:15:47 -04:00
Dawit Alemayehu
34c11bf572 Converted assert to Q_ASSERT and cleaned up include headers. 2011-07-03 16:15:34 -04:00
Martin Koller
84e22e084c Add some 0-pointer checks avoiding crashes 
BUG: 272557
 2011-06-24 21:09:11 +02:00
Dawit Alemayehu
7ac1544e33 Use KUriFilter to filter user input so that web shortcuts and short uris 
work properly.

BUG: 109217
FIXED-IN: 4.6.5
REVIEW: 101625

(cherry picked from commit 9dc77054f7)
 2011-06-22 17:31:53 -04:00
Script Kiddy
66cbe2f9f9 SVN_SILENT made messages (.desktop file) 2011-06-21 11:00:18 +02:00
Dawit Alemayehu
61bd039bf6 Show the correct url when switching tabs after clearing Konqueror's location 
bar using the clear button in the line edit or the backspace key.

BUG: 187891
FIXED-IN: 4.6.5
REVIEW: 101558

(cherry picked from commit e8abdb8bfe)
 2011-06-19 14:23:35 -04:00
Dawit Alemayehu
56299fa980 Do not change the tab icon if the supplied url is invalid, e.g blank. 
BUG: 131909
FIXED-IN: 4.6.5
REVIEW: 101626

(cherry picked from commit 831d3d151f)
 2011-06-17 00:33:31 -04:00
Dawit Alemayehu
97c50fce04 Do not provide "http://www" completion when the typed in text contains any kind 
of white space.

BUG: 129620
FIXED-IN: 4.6.5
REVIEW: 101552
(cherry picked from commit 3f8f8d1d96)
 2011-06-17 00:32:00 -04:00
Dawit Alemayehu
02edd1c5ad Show proper error message when a malformed url is entered, e.g. www.kde,org. 
Avoid converting a error url into another error url.

BUG: 218501
FIXED-IN: 4.6.5

(cherry picked from commit 69de0ca647)
 2011-06-16 12:41:53 -04:00
Dawit Alemayehu
e341dcf5d2 Removed set but unused variable (-Wunused-but-set-variable) warning. 2011-06-13 01:02:36 -04:00
Dawit Alemayehu
67625dcea3 Always honor the coordinate and size when creating a new window in 
slotCreateNewWindow.

REVIEW: 101477

(cherry picked from commit 8ea273f60e)
 2011-06-04 14:25:04 -04:00
Dawit Alemayehu
9630213d29 When a user selects 'Open With...', show the open with dialog. 
(cherry picked from commit e36179d6d9)
 2011-06-01 14:48:57 -04:00
Martin Koller
ec4483ad92 avoid 0-pointer deref 
BUG: 212586
 2011-05-30 09:47:03 +02:00
Script Kiddy
141fc67571 SVN_SILENT made messages (.desktop file) 2011-05-29 10:08:26 +02:00
Script Kiddy
84da2f4221 SVN_SILENT made messages (.desktop file) 2011-05-27 09:00:13 +02:00
Dawit Alemayehu
e19d09ba26 Use the correct service name when communicating with the proxyscout 
kded module over dbus.
 2011-05-26 14:34:23 -04:00
Burkhard Lück
52941af13c Display the tab title on root (/) folder properly in konqueror filemanager mode 
REVIEW:101374
BUG:153573
(cherry picked from commit 1163d84aeee906121bf4753903b04d4803596a54)
 2011-05-24 18:32:00 +02:00
Dawit Alemayehu
834b2e0353 - Make platform a non configurable option. It is mandatory now. 
- Make the machine type information configurable only when the add OS name
  option is checked.

This is the GUI portion of the default user-agent string commit in kdelibs.
See commit 106455c4ec9e24ae327a8a7fed5f858b899b7626.
 2011-05-19 22:52:42 -04:00
Script Kiddy
353c73e0c7 SVN_SILENT made messages (.desktop file) 2011-05-17 10:47:38 +02:00
Script Kiddy
e9b231bd42 SVN_SILENT made messages (.desktop file) 2011-05-15 09:48:59 +02:00
Alexander Potashev
2ed1c74677 Use KIntNumInput instead of QSpinBox, use plural forms for suffix 2011-05-12 11:21:29 +04:00
Script Kiddy
883da1f8a7 SVN_SILENT made messages (.desktop file) 2011-05-11 09:15:34 +02:00
Alexander Potashev
64fc10c39e Add message contexts "@title:window" to all window and dialog titles 
Context strings added to 106 strings.
http://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics

REVIEW: 101299
 2011-05-09 22:36:41 +04:00
Script Kiddy
2f6e454ef9 SVN_SILENT made messages (.desktop file) 2011-05-09 09:30:57 +02:00
Oswald Buddenhagen
3f9a1f53b5 adapt to INSTALLed permissions 2011-05-01 20:26:46 +02:00
Script Kiddy
4218dee7d5 SVN_SILENT made messages (.desktop file) 2011-05-01 09:26:23 +02:00
Montel Laurent
999fd124d0 Fix warning 2011-04-30 15:19:14 +02:00
Script Kiddy
38df1e9d67 SVN_SILENT made messages (.desktop file) 2011-04-27 10:10:44 +02:00
Dawit Alemayehu
5daad5fc12 Added option for configuring the 'Do Not Track' feature. It is on by default. 
Cleaned up the code.

REVIEW:101124
GUI:
 2011-04-18 23:51:24 -04:00
Script Kiddy
413fc1413a SVN_SILENT made messages (.desktop file) 2011-03-22 09:24:22 +01:00
Script Kiddy
30ece17b38 SVN_SILENT made messages (.desktop file) 2011-03-04 08:40:53 +01:00
Script Kiddy
9842f17d51 SVN_SILENT made messages (.desktop file) 2011-02-21 08:20:24 +01:00
Aaron Reichman
c253c60bed Fixing krazy spelling errors 2011-02-07 12:58:14 -08:00
Albert Astals Cid
3d5c593d2f shellcmdplugin moved to its own dir thus needs Messages.sh 
CCMAIL: faure@kde.org
 2011-02-06 12:24:30 +00:00
David Faure
15e02ff9eb Move all konq plugins together. 2011-02-05 10:38:19 +01:00
Script Kiddy
90b0eefd97 SVN_SILENT made messages (.desktop file) 2011-02-03 07:24:26 +01:00
Script Kiddy
eb75a90d23 SVN_SILENT made messages (.desktop file) 2011-02-02 08:24:54 +01:00
Valentin Rusu
f3e5f29a0f Fixed bug 244951 - crash when switching to midnight commander mode 2011-02-01 00:22:15 +01:00
Script Kiddy
c974bb35de SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1217852
 2011-01-29 06:08:12 +00:00
Patrick von Reth
26da0f10e3 fixed windows build 
svn path=/trunk/KDE/kdebase/apps/; revision=1217109
 2011-01-25 19:51:14 +00:00
David Faure
3740c7cafb Improve upon r1204922 so that the current servicename isn't reused for viewing unrelated mimetypes; 
e.g. "new tab" while viewing a text file in katepart would create a katepart for the about: HTML...

svn path=/trunk/KDE/kdebase/apps/; revision=1216743
 2011-01-24 13:17:40 +00:00
Dawit Alemayehu
ba4e4475ea Changed QAction to KAction where appropriate to shut up the warning message: 
"Attempt to use QAction <foo> with KXMLGUIFactory!"


svn path=/trunk/KDE/kdebase/apps/; revision=1215492
 2011-01-18 21:58:13 +00:00
Script Kiddy
fc4341d5c8 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1215307
 2011-01-18 07:23:06 +00:00
Christian Ehrlicher
cb6fd90335 remove special 'if(WIN32)' because cmake 2.6 is used already for a long time 
small qt3support--

svn path=/trunk/KDE/kdebase/apps/; revision=1214771
 2011-01-16 10:50:53 +00:00
David Faure
a96ca5bbba Don't truncate the urls in the completion when there is no title to show (e.g. local files) 
svn path=/trunk/KDE/kdebase/apps/; revision=1213862
 2011-01-11 21:58:29 +00:00
Script Kiddy
d7daa710ed SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1213663
 2011-01-11 09:07:40 +00:00
David Faure
585d6ab3ad Support for --part khtml / kwebkitpart on the command-line (useful for scripts) 
Keep current web engine when creating a new window
Cleanups (use existing request struct instead of tons of args, remove duplication, remove bool args...)

svn path=/trunk/KDE/kdebase/apps/; revision=1211815
 2011-01-05 00:52:10 +00:00
Dawit Alemayehu
22acc7d3ef Removed unnecessary debug statement... 
svn path=/trunk/KDE/kdebase/apps/; revision=1211305
 2011-01-03 16:03:50 +00:00
Dawit Alemayehu
68b0161ca7 Added a dbus interface to KonqMainWindowAdaptor to pass mimetype when creating new tab. 
See http://svn.reviewboard.kde.org/r/6243/ for details.

CCMAIL:dfaure@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=1211302
 2011-01-03 15:56:26 +00:00
David Faure
ef5d42b05b Use QComboBox::AdjustToContents (thanks psn for the hint!) so that long texts don't get truncated in the combo. 
FIXED-IN: 4.6
BUG: 258186

svn path=/trunk/KDE/kdebase/apps/; revision=1208028
 2010-12-20 11:02:58 +00:00
Jeffery MacEachern
f82131d45a Filter out spurious entries in the Browser Engine selection widget (we want "KParts/ReadOnlyPart" entries *only* - not "KParts/ReadWritePart" entries) 
svn path=/trunk/KDE/kdebase/apps/; revision=1208027
 2010-12-20 11:00:14 +00:00
Script Kiddy
870dcb8fe1 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1207957
 2010-12-20 06:25:07 +00:00
David Faure
a335acb790 Forwardport: allow to reload even after an error:// url happened internally. 
Testcase: http://asoidufaosdufasodiuf.com - or whatever your cat comes up with ;)

svn path=/trunk/KDE/kdebase/apps/; revision=1207329
 2010-12-17 15:00:57 +00:00
Script Kiddy
d27821fb7a SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1207224
 2010-12-17 06:24:18 +00:00
David Faure
c36eca1060 Use same html part as the current view in all cases of creating a new tab, including createNewWindow. 
CCMAIL: adawit@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=1204922
 2010-12-09 17:44:10 +00:00
Script Kiddy
6fddd196dc SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1204797
 2010-12-09 05:34:09 +00:00
Script Kiddy
5e95c7d087 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1204063
 2010-12-06 06:05:38 +00:00
Script Kiddy
69cf3dda1f SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1202489
 2010-12-01 06:10:29 +00:00
Script Kiddy
35944aea9a SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1201667
 2010-11-28 10:25:26 +00:00
David Faure
62f61b4378 Load parts using RTLD_GLOBAL so that the domtreeviewer can catch exceptions from khtmlpart. 
Otherwise it just crashes. Since 2005...
BUG: 110947
FIXED-IN: 4.6

svn path=/trunk/KDE/kdebase/apps/; revision=1199713
 2010-11-22 13:33:13 +00:00
Aurélien Gâteau
b45bdf1e3d Do not change label for show/hide toggle actions 
svn path=/trunk/KDE/kdebase/apps/; revision=1198714
 2010-11-19 12:24:21 +00:00
Albert Astals Cid
de634a6773 add missing </p> 
svn path=/trunk/KDE/kdebase/apps/; revision=1198519
 2010-11-18 19:37:02 +00:00
Script Kiddy
9992a731e1 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1198064
 2010-11-17 09:42:13 +00:00
Script Kiddy
919c1b3ca6 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1197261
 2010-11-15 09:33:42 +00:00
Script Kiddy
c60a346ea8 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1196577
 2010-11-13 15:48:20 +00:00
Burkhard Lück
08b475daa6 fix dead and wrong links, wrong icon, change direction of edit-clear-locationbar on the introduction page 
correct capitalization of Sidebar
BUG:256347
BUG:190990

svn path=/trunk/KDE/kdebase/apps/; revision=1196436
 2010-11-13 13:32:24 +00:00
Script Kiddy
43a322b87f SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1195993
 2010-11-12 10:36:22 +00:00
David Faure
9ae6fd6b31 fix includes 
svn path=/trunk/KDE/kdebase/apps/; revision=1195252
 2010-11-10 16:58:55 +00:00
Kevin Ottens
49b9aa7b8a Clean up the include. 
svn path=/trunk/KDE/kdebase/apps/; revision=1195251
 2010-11-10 16:57:49 +00:00
Kevin Ottens
3d32574681 Remove useless include. 
svn path=/trunk/KDE/kdebase/apps/; revision=1195249
 2010-11-10 16:55:22 +00:00
Frank Reininghaus
d1b55e1c6c Add a qWait(0) to ViewMgrTest::testLinkedViews(), as discussed with 
David. This makes the test pass on my system.

svn path=/trunk/KDE/kdebase/apps/; revision=1194795
 2010-11-09 22:11:11 +00:00
Aurélien Gâteau
d13ac6e9e9 Revert "showMenuBar is deprecated, use showHideMenuBar instead." 
svn path=/trunk/KDE/kdebase/apps/; revision=1194445
 2010-11-09 00:15:12 +00:00
Script Kiddy
13b248cf19 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1193244
 2010-11-05 09:45:47 +00:00
David Faure
8a79559e8f port to K_PLUGIN_FACTORY / K_EXPORT_PLUGIN 
svn path=/trunk/KDE/kdebase/apps/; revision=1193171
 2010-11-04 22:33:16 +00:00
Script Kiddy
aee1288283 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1193019
 2010-11-04 10:14:33 +00:00
David Faure
af82d1b93b kpartplugin -> gui, to follow the DTD and make version-number work 
svn path=/trunk/KDE/kdebase/apps/; revision=1192790
 2010-11-04 00:52:56 +00:00
Pino Toscano
d66c6a5844 remove i18n strings, unneeded in an unit test 
svn path=/trunk/KDE/kdebase/apps/; revision=1192365
 2010-11-02 18:12:46 +00:00
Script Kiddy
20e9f977a7 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1191511
 2010-10-31 09:11:11 +00:00
David Faure
bf56988449 Port away from KLibLoader, use KLibrary directly. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190508
 2010-10-27 22:11:06 +00:00
Kevin Ottens
4a16106e9a Remove useless include. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190396
 2010-10-27 14:29:35 +00:00
Kevin Ottens
2f9b31fb02 moveItem is deprecated, use moveBookmark instead (that's what moveItem 
does anyway).

svn path=/trunk/KDE/kdebase/apps/; revision=1190395
 2010-10-27 14:29:00 +00:00
Kevin Ottens
806db0160c KFileItem::acceptsDrops() is deprecated, reimplement here. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190394
 2010-10-27 14:28:25 +00:00
Kevin Ottens
7a8c1039e2 Add missing include. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190393
 2010-10-27 14:27:31 +00:00
Kevin Ottens
2d09dec7aa showMenuBar is deprecated, use showHideMenuBar instead. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190392
 2010-10-27 14:27:15 +00:00
Kevin Ottens
8017927b0d setTabReorderingEnabled is deprecated, use setMovable instead. 
svn path=/trunk/KDE/kdebase/apps/; revision=1190391
 2010-10-27 14:26:52 +00:00
David Faure
cfbbccd2de port to K_PLUGIN_FACTORY 
svn path=/trunk/KDE/kdebase/apps/; revision=1190344
 2010-10-27 12:49:22 +00:00
David Faure
d0eb4b8a06 reverse unwanted commit; not sure this is needed, needs more investigation 
svn path=/trunk/KDE/kdebase/apps/; revision=1190336
 2010-10-27 12:31:26 +00:00
David Faure
bc814ff611 Replace deprecated include with the new one 
svn path=/trunk/KDE/kdebase/apps/; revision=1190332
 2010-10-27 12:17:54 +00:00
Script Kiddy
2f57105551 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1190264
 2010-10-27 09:11:14 +00:00
Yuri Chornoivan
c2b8677ce9 fix typo 
svn path=/trunk/KDE/kdebase/apps/; revision=1190145
 2010-10-27 05:16:52 +00:00
Burkhard Lück
c22f36db91 syncing whatsthis text in konqueror.kcfg + behaviour.cpp 
svn path=/trunk/KDE/kdebase/apps/; revision=1190067
 2010-10-26 20:27:37 +00:00
Burkhard Lück
0609f276dc this applies to all menus 
svn path=/trunk/KDE/kdebase/apps/; revision=1189970
 2010-10-26 14:04:46 +00:00
Script Kiddy
a04bebbbf4 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1189884
 2010-10-26 09:57:26 +00:00
Dawit Alemayehu
c53b58fc28 Cosmetic change and other minor fixes 
svn path=/trunk/KDE/kdebase/apps/; revision=1189043
 2010-10-23 20:23:05 +00:00
Script Kiddy
376a096fc3 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1188900
 2010-10-23 09:30:54 +00:00
Dawit Alemayehu
f0c3a7327f - Merge the display of cookies for domains ".foo.bar" and "foo.bar" under a single entry "foo.bar". 
- Fixed the retreival of cookies to be displayed to include those from ".foo.bar" when a site entry is expanded.
- Make sure the apply button gets disabled when reload button is clicked.
- Use the Qt signal/slot auto connect feature to simply code.

svn path=/trunk/KDE/kdebase/apps/; revision=1188294
 2010-10-21 22:35:21 +00:00
David Faure
7088bda7ea Forwardport 1187708: fix Ctrl+Shift+R is ambiguously assigned to both "Close Active View" and "Force Reload Page" 
(bug 184492)

svn path=/trunk/KDE/kdebase/apps/; revision=1187711
 2010-10-20 08:47:41 +00:00
David Faure
e1e49fee0a Make the shortcut for "Add bookmark" configurable, even though it's initially created in a separate action collection 
so that the shortcuts and toolbar dialogs don't get polluted with thousand of bookmark actions.
FIXED-IN: 4.6
BUG: 153835

svn path=/trunk/KDE/kdebase/apps/; revision=1187607
 2010-10-19 21:18:30 +00:00
Oswald Buddenhagen
d8276923fc actually install the .desktop files as executables 
changing merely the file permissions is the repo is quite a noop as far
as cmake is concerned.


svn path=/trunk/KDE/kdebase/apps/; revision=1187438
 2010-10-19 12:44:48 +00:00
Script Kiddy
ad11a42a81 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1186710
 2010-10-17 09:10:25 +00:00
David Faure
44e411a8a9 Forwardport 1186317: '~' also denotes the beginning of a local path, like '/', so don't prepend http://www. in the completion offers. BUG 90005. 
svn path=/trunk/KDE/kdebase/apps/; revision=1186319
 2010-10-15 20:04:29 +00:00
David Faure
29e526053a Make executable the Type=Application .desktop files we install, 
so that they can be used even from a KDE running in another prefix (http://markmail.org/message/4p3krovtnzwx35zd)

svn path=/trunk/KDE/kdebase/apps/; revision=1182558
 2010-10-04 22:55:09 +00:00
David Faure
36cf2d5de0 Don't install the libkonquerorprivate.so symlink 
svn path=/trunk/KDE/kdebase/apps/; revision=1182392
 2010-10-04 12:07:24 +00:00
Script Kiddy
a71593dffd SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1182077
 2010-10-03 10:03:57 +00:00
David Faure
d6eb33bccf Port to KParts::TextExtension, so that this doesn't have to link both khtml and webkit anymore. 
You need kdelibs trunk (>= last Friday).

svn path=/trunk/KDE/kdebase/apps/; revision=1180213
 2010-09-27 11:49:14 +00:00
Andrius Štikonas
dd1c57eeb5 i18n: Use plural suffixes in spinBoxes. 
svn path=/trunk/KDE/kdebase/apps/; revision=1179904
 2010-09-26 13:22:37 +00:00
Script Kiddy
a5b632b893 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1179826
 2010-09-26 09:11:16 +00:00
Script Kiddy
449a67233a SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1179366
 2010-09-25 08:36:32 +00:00
David Faure
4a5ed43b67 GUI: Provide an easier way to select the preferred web engine in Konqueror. 
svn path=/trunk/KDE/kdebase/apps/; revision=1178254
 2010-09-22 14:37:11 +00:00
Laurent Montel
ac2789981a Use QLatin1String in setObjectName (added with a script) 
svn path=/trunk/KDE/kdebase/apps/; revision=1178049
 2010-09-22 07:35:22 +00:00
Script Kiddy
ff4d736673 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1177799
 2010-09-21 10:01:09 +00:00
Burkhard Lück
1560903bc4 change gui strings from ktts to Jovie 
svn path=/trunk/KDE/kdebase/apps/; revision=1177051
 2010-09-19 08:47:49 +00:00
Dawit Alemayehu
2dbed3380a Fixed general dialog layout 
svn path=/trunk/KDE/kdebase/apps/; revision=1176940
 2010-09-19 05:42:14 +00:00
Script Kiddy
c5fcd00018 SVN_SILENT made messages (.desktop file) 
svn path=/trunk/KDE/kdebase/apps/; revision=1174377
 2010-09-12 08:31:20 +00:00
Luboš Luňák
0db6747fc6 avoid infinite loop when the service configured as the default 
browser doesn't exist (bnc#623478)


svn path=/trunk/KDE/kdebase/apps/; revision=1172570
 2010-09-07 14:33:41 +00:00
Luboš Luňák
2c824aa6dc revert r1172559, after a second thought - this can stop it from working 
properly sometimes, and it's working around a broken setup in the first place


svn path=/trunk/KDE/kdebase/apps/; revision=1172568
 2010-09-07 14:31:08 +00:00
Luboš Luňák
90575546fc 'warning: converting 'false' to pointer type for argument' and the argument 
was useless anyway


svn path=/trunk/KDE/kdebase/apps/; revision=1172562
 2010-09-07 14:21:08 +00:00
Luboš Luňák
26f3d070c2 avoid infinite loop with weird setup with other KDE version, just in case 
svn path=/trunk/KDE/kdebase/apps/; revision=1172559
 2010-09-07 14:15:53 +00:00