diff -Nru filelight-1.9~rc2/ChangeLog filelight-1.9~rc3/ChangeLog --- filelight-1.9~rc2/ChangeLog 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/ChangeLog 2009-03-28 02:48:31.000000000 +0000 @@ -1,3 +1,127 @@ +1.9 + Ported to Qt 4 / KDE 4 + Paint directly on the widget + Remove ugly hack for checking for backingstore + +1.0 + Added copy to clipboard function to segment context menus + Accepts URLs from drag and drop + Click central circle to go "up" + +0.6.3 + Made "Scan Directory..." a KStdAction::open with setText( "Scan Directory..." ); + Swaped map rendering from bitBlt to paintPixmap (again) as some users get problems with the labels being obliterated + LocationBar history is saved inbetween sessions for KDE >= 3.1.3 + Rescans are forced if locationBar Go is pushed for location to current map + Fixed several bugs related to resizing the filemap + Initial map display had a long running issue which meant you had to perform a resize to ensure all detail was shown. I finally put in the hours and fixed it. + Cancelling scans clears the location bar + Option to show files not represented as segments (because they are too small) combined in large segments with relevant summaries + Directories that would normally have no child segments shown now have hidden Files segment shown + Fixed faulty show/hide of progress box when many scans done in quick succession + Session management + Saving of Window/*bar settings inbetween sessions + Fixed popup related non-updates and false action calls + Canvas code cleanup + Stopped combo activated scans being called twice + Improved map generation speed (scan speeds are still slow however) + Appropriate wait cursors are set during long operations (scans, map generation) + Fixed misrendered transparency when tooltips exceed Filelight boundries + Optimised and de-flickered the tooltips + Segments that contain unrepresented files (due to 5 level limit on maps) now show a thick border at the edge to indicate that there are unrepresented files + Commandline now accepts ../ and ./ type arguments + Add "Open Konsole here" to context-menu, also tidied it up and made it properly context relevant + Popup title is now relative to map path to reduce menu width somewhat without resorting to csqueeze() + Fixed bug with not showing unrepresented files for dirs that contained dirs + Improvement selection of units for tooltips (always prefer megabytes unless < 0.01 MB) + Improved selection of decimal places for size display (2sig.fig. please) + Label font sizes now default to the system standard + Labels have indentation relative to their level + Label selection improved (not enough yet though!) + Better looking label line diagonals + When smaller fonts are requested, Filelight maximises the font size differences + Attempted to fix crash at exit bug + Made files shades of gray, made indicator for directories that have unshown files + Removed presence of multi-file segments except in root level circumstances (unless Show Small Files is selected in Settings) + Contrast system revamped, you can now have more contrast + Segment colouring system rewritten, better distinction between different segment types + Used more KStdActions (less work for translation teams at very least) + Fixed bug where segmenttip wasn't shown for 1st pixel but labels were + Directories with unshown files have better arrow heads now thanks to some clever trig + Checked for possible cases where division by zero might occur and corrected code + Huge code rewrite in preparation for transition to KPart (must release soon, this is getting silly) + Allow clicks on the central circle to represent the map's root (eg. middle-click to open in Konqi) +0.6.2 + Attempted a fix for the absurdly large file bug (eg > 1400GB!) + Linking bug fixed for Gentoo systems + Compile bug fixed for GCC < 3 + Fixed crash bug when scan had been stopped and then back then forward pressed + Fixed another compile bug for systems that don't support large files (Debian apparently) + Internationalisation support thanks to patch from André Somers + Made the tooltip translucent (NOT a gimmick, this feature is essential IMO) + Started making debug messages use kdDebug so users can enable/disable the messages + Implemented XML GUI + Vast slot/signal cleanup, fixed many bugs + Fixed a few bugs with the progress box + Cancelled scans now remain stored in the back/forward histories + Fixed incorrect reporting of directory file counts + Increased minimum segment size to 3px outer diameter (any depth) + Added location_bar UI element to toolbar (much work) + The segment tip now appears below the cursor when hovering over the upper part of the map + Increased the recent scans list to 8 entries and made the combohistory work better +0.6.1 + Filelight again compiles on KDE <= 3.1.3 (but with some reduced functionality) + Rewrote HistoryAction code + Improved default choice of smallest font + Lowest level segment labels show whenever mouse is not over anything + Middle click opens segment according to mime type (eg. jpgs open in kuickshow) + Implemented realtime contrast updates + Added antialiasing, font size and contrast settings to appearance tab + Renamed "colour scheme" tab "appearance" + Extruded label fontsizes reflect their segment's depth + Rescans ignore tree cache + Changing scan options clears the tree cache + Directory select dialog shows current path as selected when opened + Scans no longer have to be repeated + Implemented antialiasing for the map, very slow so only happens after resizes + Gracefully handles failures to read file attributes + Rewrote backend with templating, should have done that in first place! + Improved changelog listing methods! + Included support for GNU systems that don't support large files (>2GB) +0.6.0 + Added expanded labels to give more information on segments in focus + Added settings dialogs + Added new colour schemes + Allowed scans to not cross at mount points + Added #Files info for directory tooltips + filemap is now displayed centrally + Shows percentage of files in directories +0.5.1 + Added Filelight to the Utilities submenu in the K-Menu + Tooltips are now presented for file info instead of using the statusbar + Made resizing of the filemap smoother + Improved the icon and made a 48x48 and 22x22 version + Reworked the code somewhat + Scans can now be cancelled + The go history actions are more intelligent + Fixed all the bugs I could find + Attempted to improve filemap contrast some more (still not perfect, but getting there) + Added visual activation cues for various clicks +0.50 + Few bug fixes + Improved performance for rendering and scanning + Improved contrast of the filemap + Added icon + Added left and right click functionality + Improved error handling +0.45 + Added toolbar, implemented history functionality + Click to scan segments + Increased filesize limit to 4096 GB + Fixed required - make bug + Various optimisations +0.4 + Initial public release 1.0 Added copy to clipboard function to segment context menus Accepts URLs from drag and drop @@ -52,7 +176,7 @@ Compile bug fixed for GCC < 3 Fixed crash bug when scan had been stopped and then back then forward pressed Fixed another compile bug for systems that don't support large files (Debian apparently) - Internationalisation support thanks to patch from Andr Somers + Internationalisation support thanks to patch from André Somers Made the tooltip translucent (NOT a gimmick, this feature is essential IMO) Started making debug messages use kdDebug so users can enable/disable the messages Implemented XML GUI diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/CMakeLists.txt --- filelight-1.9~rc2/CMakeLists.txt 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/CMakeLists.txt 2009-08-21 03:40:27.000000000 +0100 @@ -18,6 +18,8 @@ # along with this program. If not, see . ####################################################################### +project(Filelight) + find_package(KDE4 REQUIRED) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -fPIC) @@ -26,7 +28,7 @@ include(MacroLibrary) -include_directories(src/ ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) +include_directories( src/ ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) add_subdirectory(src) add_subdirectory(misc) diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/debian/changelog /tmp/EP1wgmhdxd/filelight-1.9~rc3/debian/changelog --- filelight-1.9~rc2/debian/changelog 2009-11-25 11:00:23.000000000 +0000 +++ filelight-1.9~rc3/debian/changelog 2009-11-25 11:00:23.000000000 +0000 @@ -1,3 +1,9 @@ +filelight (1.9~rc3-1ubuntu0~ppa1) karmic; urgency=low + + * Switch to new rc3 from upstream. + + -- Dominik Stadler (Ubuntu key) Wed, 25 Nov 2009 11:16:40 +0100 + filelight (1.9~rc2-1ubuntu1) karmic; urgency=low * Merge with Debian, remaining change is only .orig md5sum diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/misc/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/misc/CMakeLists.txt --- filelight-1.9~rc2/misc/CMakeLists.txt 2009-03-08 02:07:48.000000000 +0000 +++ filelight-1.9~rc3/misc/CMakeLists.txt 2009-03-29 15:08:12.000000000 +0100 @@ -18,8 +18,6 @@ # along with this program. If not, see . ####################################################################### -include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - install(FILES filelight_part.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES filelight.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES filelightrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/config) diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/misc/filelight.desktop /tmp/EP1wgmhdxd/filelight-1.9~rc3/misc/filelight.desktop --- filelight-1.9~rc2/misc/filelight.desktop 2009-03-08 14:53:03.000000000 +0000 +++ filelight-1.9~rc3/misc/filelight.desktop 2009-10-08 10:24:27.000000000 +0100 @@ -1,25 +1,57 @@ # KDE Config File [Desktop Entry] Name=Filelight +Name[bg]=Filelight +Name[da]=Filelight +Name[de]=Filelight +Name[en_GB]=Filelight +Name[es]=Filelight +Name[et]=Filelight +Name[fr]=Filelight +Name[ga]=Filelight +Name[gl]=Filelight +Name[ja]=Filelight +Name[km]=Filelight +Name[nds]=Filelight +Name[pt]=Filelight +Name[pt_BR]=Filelight +Name[sv]=Filelight +Name[tr]=Filelight +Name[uk]=Filelight Name[x-test]=xxFilelightxx GenericName=Disk Usage Statistics +GenericName[bg]=Статистика на ползването на диска +GenericName[da]=Statistik over diskforbrug +GenericName[en_GB]=Disk Usage Statistics +GenericName[es]=Estadísticas sobre el uso del disco GenericName[et]=Kettakasutuse statistika GenericName[fr]=Statistiques d'utilisation des disques durs. GenericName[gl]=Estatísticas da utilización do disco GenericName[ja]=ディスクの使用状況 +GenericName[km]=ស្ថិតិ​កា​រប្រើ​ថាស +GenericName[nds]=Fastplaatbruuk-Statistik GenericName[pt]=Estatísticas de Utilização do Disco GenericName[pt_BR]=Estatísticas do uso do disco GenericName[sv]=Statistik över diskanvändning +GenericName[tr]=Disk Kullanım İstatistikleri GenericName[uk]=Статистика використання диска +GenericName[x-test]=xxDisk Usage Statisticsxx Type=Application Exec=filelight %f Icon=filelight Comment=View disk usage information +Comment[bg]=Преглед на данни за използването на диска +Comment[da]=Vis information om diskforbrug +Comment[de]=Nutzungsinformationen zu Festplatten anzeigen +Comment[en_GB]=View disk usage information +Comment[es]=Ver información de uso del disco Comment[et]=Kettakasutuse teabe kuvamine Comment[fr]=Voir de l'information sur l'utilisation des disques durs Comment[ga]=Amharc ar fhaisnéis maidir le húsáid diosca Comment[gl]=Mostra información do uso do disco Comment[ja]=ディスクの使用状況を表示します +Comment[km]=មើល​ព័ត៌មាន​ប្រើ​ថាស​រឹង +Comment[nds]=Wiest Informatschonen över den Bruuk vun de Fastplaat Comment[pt]=Ver informações de utilização do disco Comment[pt_BR]=Visualize a informação de uso do disco Comment[sv]=Visa information om hårddiskanvändning diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/misc/filelight_part.desktop /tmp/EP1wgmhdxd/filelight-1.9~rc3/misc/filelight_part.desktop --- filelight-1.9~rc2/misc/filelight_part.desktop 2009-02-23 13:47:08.000000000 +0000 +++ filelight-1.9~rc3/misc/filelight_part.desktop 2009-10-08 10:24:27.000000000 +0100 @@ -1,13 +1,20 @@ [Desktop Entry] Encoding=UTF-8 Name=RadialMap View +Name[bg]=Изглед с радиална карта +Name[da]=Radialkort-visning +Name[de]=Radialansicht +Name[en_GB]=RadialMap View +Name[es]=Vista del mapa radial Name[et]=Radiaalvaade Name[fr]=Vue RadialMap Name[ga]=Mapa Gathach Name[gl]=Vista en mapa radial Name[ja]=放射状マップ表示 +Name[km]=ទិដ្ឋភាព RadialMap +Name[nds]=RadialMap View Name[pt]=Vista em Mapa Radial -Name[pt_BR]=Vista em Mapa Radial +Name[pt_BR]=Visualização em mapa radial Name[sv]=Radiell avbildningsvy Name[tr]=RadialMap Görüntüleme Name[uk]=Перегляд RadialMap diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/misc/filelightui.rc /tmp/EP1wgmhdxd/filelight-1.9~rc3/misc/filelightui.rc --- filelight-1.9~rc2/misc/filelightui.rc 2009-02-25 22:06:00.000000000 +0000 +++ filelight-1.9~rc3/misc/filelightui.rc 2009-03-27 23:37:04.000000000 +0000 @@ -43,8 +43,6 @@ - - @@ -62,8 +60,6 @@ - - @@ -83,8 +79,6 @@ - - diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/app/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/app/CMakeLists.txt --- filelight-1.9~rc2/src/app/CMakeLists.txt 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/app/CMakeLists.txt 2009-03-29 15:08:12.000000000 +0100 @@ -18,8 +18,6 @@ # along with this program. If not, see . ####################################################################### -include_directories(${CMAKE_SOURCE_DIR}/filelight/src ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) - set(filelight_SRCS historyAction.cpp mainWindow.cpp main.cpp) kde4_add_executable(filelight ${filelight_SRCS}) diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/app/historyAction.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/app/historyAction.cpp --- filelight-1.9~rc2/src/app/historyAction.cpp 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/app/historyAction.cpp 2009-03-28 02:16:59.000000000 +0000 @@ -29,29 +29,31 @@ #include -inline HistoryAction::HistoryAction(const QString &text, KActionCollection *ac) - : KAction(text, ac) +inline HistoryAction::HistoryAction(const KIcon &icon, const QString &text, KActionCollection *ac) + : KAction(icon, text, ac) , m_text(text) { // .ui files make this false, but we can't rely on UI file as it isn't compiled in :( - KAction::setEnabled(false); + setEnabled(false); } void HistoryAction::push(const QString &path) { - if (!path.isEmpty() && !m_list.isEmpty() && m_list.last() != path) - { + if (path.isEmpty()) return; + + if (m_list.isEmpty() || (!m_list.isEmpty() && (m_list.last() != path))) m_list.append(path); - setActionMenuTextOnly(this, path); - KAction::setEnabled(true); - } + + setActionMenuTextOnly(this, path); + setEnabled(true); } QString HistoryAction::pop() { - const QString s = m_list.last(); - m_list.pop_back(); - setActionMenuTextOnly(this, m_list.last()); + const QString s = m_list.takeLast(); + if (!m_list.isEmpty()) + setActionMenuTextOnly(this, m_list.last()); + setEnabled(); return s; } @@ -60,10 +62,12 @@ HistoryCollection::HistoryCollection(KActionCollection *ac, QObject *parent) : QObject(parent) - , m_b(new HistoryAction(i18n("Back"), ac)) - , m_f(new HistoryAction(i18n("Forward"), ac)) + , m_b(new HistoryAction(KIcon("go-previous"), i18n("Back"), ac)) + , m_f(new HistoryAction(KIcon("go-next"), i18n("Forward"), ac)) , m_receiver(0) { + ac->addAction("go_back", m_b); + ac->addAction("go_forward", m_f); connect(m_b, SIGNAL(activated()), SLOT(pop())); connect(m_f, SIGNAL(activated()), SLOT(pop())); } diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/app/historyAction.h /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/app/historyAction.h --- filelight-1.9~rc2/src/app/historyAction.h 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/app/historyAction.h 2009-03-28 02:16:59.000000000 +0000 @@ -22,9 +22,9 @@ #ifndef HISTORYACTION_H #define HISTORYACTION_H -#include -#include -#include +#include +#include +#include class KConfigGroup; class KActionCollection; @@ -36,7 +36,7 @@ class HistoryAction : KAction { - HistoryAction(const QString &text, KActionCollection *ac); + HistoryAction(const KIcon &icon, const QString &text, KActionCollection *ac); friend class HistoryCollection; @@ -47,6 +47,7 @@ void clear() { m_list.clear(); + setEnabled(false); KAction::setText(m_text); } diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/app/mainWindow.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/app/mainWindow.cpp --- filelight-1.9~rc2/src/app/mainWindow.cpp 2009-03-09 16:14:16.000000000 +0000 +++ filelight-1.9~rc3/src/app/mainWindow.cpp 2009-05-30 00:10:16.000000000 +0100 @@ -85,7 +85,7 @@ //TODO test these connect(m_part, SIGNAL(canceled(const QString&)), m_histories, SLOT(stop())); - connect(BrowserExtension::childObject(m_part), SIGNAL(openURLNotify()), SLOT(urlAboutToChange())); + connect(BrowserExtension::childObject(m_part), SIGNAL(openUrlNotify()), SLOT(urlAboutToChange())); const KConfigGroup config = KGlobal::config()->group("general"); m_combo->setHistoryItems(config.readPathEntry("comboHistory", QStringList())); @@ -177,9 +177,8 @@ inline void MainWindow::configToolbars() //slot { KEditToolBar dialog(factory(), this); - // dialog.showButtonApply(false); //TODO: Is this still needed? - if (dialog.exec()) + if (dialog.exec()) //krazy:exclude=crashy { createGUI(m_part); applyMainWindowSettings(KGlobal::config()->group("window")); @@ -229,13 +228,14 @@ bool MainWindow::slotScanUrl(const KUrl &url) { const KUrl oldUrl = m_part->url(); - const bool b = m_part->openUrl(url); - if (b) { + if (m_part->openUrl(url)) + { m_histories->push(oldUrl); - //action("go_back")->setEnabled(false); //FIXME + return true; } - return b; + else + return false; } inline void MainWindow::slotAbortScan() @@ -308,6 +308,7 @@ void setActionMenuTextOnly(KAction *a, QString const &suffix) { + //TODO: In KDE 4.3, we have KAction::setHelpText(), which can replace this. QString const menu_text = suffix.isEmpty() ? a->text() : i18nc("&Up: /home/mxcl", "%1: %2", a->text(), suffix); diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/CMakeLists.txt --- filelight-1.9~rc2/src/CMakeLists.txt 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/CMakeLists.txt 2009-03-29 15:08:12.000000000 +0100 @@ -18,7 +18,5 @@ # along with this program. If not, see . ####################################################################### -include_directories($ {KDE4_INCLUDES} $ {KDE4_INCLUDE_DIR} $ {QT_INCLUDES} ) - add_subdirectory(app) add_subdirectory(part) diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/define.h /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/define.h --- filelight-1.9~rc2/src/define.h 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/define.h 2009-10-10 12:44:10.000000000 +0100 @@ -30,7 +30,7 @@ #undef PRETTYNAME #define APP_NAME "filelight" -#define APP_VERSION "1.9" +#define APP_VERSION "1.9rc3" #define APP_PRETTYNAME "Filelight" #endif diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/CMakeLists.txt --- filelight-1.9~rc2/src/part/CMakeLists.txt 2009-02-20 23:22:02.000000000 +0000 +++ filelight-1.9~rc3/src/part/CMakeLists.txt 2009-03-29 15:08:12.000000000 +0100 @@ -18,8 +18,6 @@ # along with this program. If not, see . ####################################################################### -include_directories(${CMAKE_SOURCE_DIR}/filelight/src ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - add_subdirectory(radialMap) set(filelight_PART_SRCS @@ -41,10 +39,8 @@ ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} - ${KDE4_SOLID_LIBS} - qimageblitz) + ${KDE4_SOLID_LIBS}) install(TARGETS filelightpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/dialog.ui /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/dialog.ui --- filelight-1.9~rc2/src/part/dialog.ui 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/part/dialog.ui 2009-05-29 23:44:37.000000000 +0100 @@ -1,7 +1,8 @@ - + + Dialog - - + + 0 0 @@ -9,72 +10,62 @@ 405 - + Settings - Filelight - + - - - + + + 0 0 - + false - - 1 + + 0 - - + + Scannin&g - + - - - + + + 0 0 - + Do &not scan these directories: - + Qt::PlainText - + false - - m_listBox - - - - - - - Filelight will not scan these directories unless you specifically request them. - - + - + - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 180 21 @@ -83,27 +74,27 @@ - - + + true - + R&emove - + false - - + + &Add... - + false - + false @@ -111,38 +102,38 @@ - - + + 0 15 - + QFrame::HLine - + QFrame::Sunken - + 1 - + 1 - - - - + + + + Qt::Horizontal - + QSizePolicy::Fixed - + 16 50 @@ -150,59 +141,59 @@ - - - + + + false - + 0 0 - + 32767 32767 - + false - + - + Prevents scanning of filesystems that are not on this computer, e.g. NFS or Samba mounts. - + Exclude remote files&ystems - - - - Allows scans to enter directories that are part of other filesystems. For example, when unchecked, this will usually prevent the contents of <b>/mnt</b> from being scanned if you scan <b>/</b>. + + + + Allows scans to enter directories that are part of other filesystems. For example, when unchecked, this will usually prevent the contents of <b>/mnt</b> from being scanned if you scan <b>/</b>. - + Scan across filesystem &boundaries - - - + + + false - + - + Prevents Filelight from scanning removable media (eg. CD-ROMs). - + E&xclude removable media @@ -211,77 +202,77 @@ - - + + &Appearance - + - - - + + + 0 0 - + Color scheme - + - + - - + + 0 - + QLayout::SetNoConstraint - + 0 - - - + + + 0 0 - + Co&ntrast - + Qt::PlainText - + false - + contrastSlider - - - + + + 0 0 - + Here you can vary the contrast of the filemap in realtime. - + 1 - + 100 - + Qt::Horizontal @@ -292,52 +283,52 @@ - - + + true - + The font size of exploded labels can be varied relative to the depth of the directories they represent. This helps you spot the important labels more easily. Set a sensible minimum font size. - + Var&y label font sizes - - + + Anti-aliasing the filemap makes it clearer and prettier, unfortunately it also makes rendering very slow. - + &Use anti-aliasing - - - Some files are too small to be rendered on the filemap. Selecting this option makes these files visible by merging them all into a single "multi-segment". + + + Some files are too small to be rendered on the filemap. Selecting this option makes these files visible by merging them all into a single "multi-segment". - + Show small files - - + + QLayout::SetMinimumSize - - + + Qt::Horizontal - + QSizePolicy::Fixed - + 20 20 @@ -346,36 +337,36 @@ - - + + true - - + + 0 0 - + The smallest font size Filelight can use to render labels. - + Minimum font si&ze: - + Qt::PlainText - + false - + minFontPitch - - + + 20 @@ -383,11 +374,11 @@ - - + + Qt::Vertical - + 20 40 @@ -400,32 +391,32 @@ - - + + QLayout::SetFixedSize - - + + Reset any changes you have made since you opened this dialog. - + &Reset - + false - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 120 30 @@ -434,11 +425,11 @@ - - + + &Close - + true @@ -447,17 +438,13 @@ - + - Q3ListBox - Q3Frame -
q3listbox.h
- - - QButtonGroup - QWidget -
qbuttongroup.h
+ KButtonGroup + QGroupBox +
kbuttongroup.h
+ 1 @@ -465,7 +452,6 @@ varyLabelFontSizes m_resetButton m_closeButton - m_listBox m_removeButton m_addButton scanAcrossMounts @@ -480,11 +466,11 @@ Dialog toggleScanAcrossMounts(bool) - + 20 20 - + 20 20 @@ -496,11 +482,11 @@ Dialog toggleDontScanRemoteMounts(bool) - + 20 20 - + 20 20 @@ -512,11 +498,11 @@ Dialog toggleDontScanRemovableMedia(bool) - + 20 20 - + 20 20 diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/localLister.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/localLister.cpp --- filelight-1.9~rc2/src/part/localLister.cpp 2009-03-08 01:06:58.000000000 +0000 +++ filelight-1.9~rc3/src/part/localLister.cpp 2009-05-29 23:44:37.000000000 +0100 @@ -75,7 +75,7 @@ Directory *tree = scan(path, path); //delete the list of trees useful for this scan, - //in a sucessful scan the contents would now be transfered to 'tree' + //in a sucessful scan the contents would now be transferred to 'tree' delete m_trees; if (ScanManager::s_abort) //scan was cancelled diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/part.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/part.cpp --- filelight-1.9~rc2/src/part/part.cpp 2009-03-09 17:15:25.000000000 +0000 +++ filelight-1.9~rc3/src/part/part.cpp 2009-04-29 15:31:57.000000000 +0100 @@ -83,10 +83,13 @@ m_map = new RadialMap::Widget(widget()); m_layout->addWidget(m_map); - m_stateWidget = new QLabel(i18n("Busy ...")); //TODO: Something more fancy. - m_stateWidget->setAlignment(Qt::AlignCenter); + m_stateWidget = new ProgressBox(statusBar(), this); + m_layout->addWidget(m_stateWidget); m_stateWidget->hide(); + m_numberOfFiles = new QLabel(); + m_statusbar->addStatusBarItem(m_numberOfFiles, 0, true); + KStandardAction::zoomIn(m_map, SLOT(zoomIn()), actionCollection()); KStandardAction::zoomOut(m_map, SLOT(zoomOut()), actionCollection()); KStandardAction::preferences(this, SLOT(configFilelight()), actionCollection()); @@ -181,6 +184,7 @@ statusBar()->showMessage(i18n("Aborting Scan...")); m_map->hide(); + m_stateWidget->hide(); m_summary->show(); @@ -226,7 +230,7 @@ ki18n("Displays file usage in an easy to understand way."), KAboutData::License_GPL, ki18n("(c) 2002-2004 Max Howell\n\ - (c) 2008 Martin T. Sandsmark"), + (c) 2008-2009 Martin T. Sandsmark"), ki18n("Please report bugs."), "http://iskrembilen.com/", "sandsmark@iskrembilen.com"); @@ -236,12 +240,13 @@ Part::start(const KUrl &url) { if (!m_started) { - m_statusbar->addStatusBarItem(new ProgressBox(statusBar(), this), 0, true); connect(m_map, SIGNAL(mouseHover(const QString&)), statusBar(), SLOT(message(const QString&))); connect(m_map, SIGNAL(created(const Directory*)), statusBar(), SLOT(clear())); m_started = true; } + m_numberOfFiles->setText(""); + if (m_manager->start(url)) { setUrl(url); @@ -300,10 +305,8 @@ emit setWindowCaption(prettyUrl()); - ProgressBox *progress = statusBar()->findChild(); + m_numberOfFiles->setText(QString::number(tree->children()) + " files"); - if (progress) - progress->setText(tree->children()); } } //namespace Filelight diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/part.h /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/part.h --- filelight-1.9~rc2/src/part/part.h 2009-03-09 16:14:16.000000000 +0000 +++ filelight-1.9~rc3/src/part/part.h 2009-04-29 15:31:57.000000000 +0100 @@ -86,8 +86,9 @@ BrowserExtension *m_ext; StatusBarExtension *m_statusbar; RadialMap::Widget *m_map; - QLabel *m_stateWidget; + QWidget *m_stateWidget; class ScanManager *m_manager; + QLabel *m_numberOfFiles; bool m_started; diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/radialMap/builder.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/radialMap/builder.cpp --- filelight-1.9~rc2/src/part/radialMap/builder.cpp 2009-02-20 12:16:49.000000000 +0000 +++ filelight-1.9~rc3/src/part/radialMap/builder.cpp 2009-03-09 18:48:48.000000000 +0000 @@ -147,7 +147,8 @@ { //append a segment for unrepresented space - a "fake" segment - const QString s = i18n("%1 files, with an average size of %2", + const QString s = i18np("1 file, with an average size of %2", + "%1 files, with an average size of %2", hiddenFileCount, File::humanReadableSize(hiddenSize/hiddenFileCount)); diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/radialMap/CMakeLists.txt /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/radialMap/CMakeLists.txt --- filelight-1.9~rc2/src/part/radialMap/CMakeLists.txt 2009-02-02 18:07:44.000000000 +0000 +++ filelight-1.9~rc3/src/part/radialMap/CMakeLists.txt 2009-03-29 15:08:12.000000000 +0100 @@ -18,8 +18,6 @@ # along with this program. If not, see . ####################################################################### -include_directories(${CMAKE_SOURCE_DIR}/filelight/src/part ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) - set(radialmap_STAT_SRCS widget.cpp builder.cpp @@ -29,5 +27,5 @@ segmentTip.cpp) kde4_add_library(radialmap STATIC ${radialmap_STAT_SRCS} ) -find_package(Blitz REQUIRED) + diff -Nru /tmp/QpsrdaPDx2/filelight-1.9~rc2/src/part/radialMap/labels.cpp /tmp/EP1wgmhdxd/filelight-1.9~rc3/src/part/radialMap/labels.cpp --- filelight-1.9~rc2/src/part/radialMap/labels.cpp 2009-02-12 20:56:28.000000000 +0000 +++ filelight-1.9~rc3/src/part/radialMap/labels.cpp 2009-05-29 23:10:58.000000000 +0100 @@ -19,13 +19,10 @@ * along with this program. If not, see . ***********************************************************************/ -#include -#include -#include -#include -#include -//Added by qt3to4: -#include +#include +#include +#include +#include #include "part/Config.h" #include "part/fileTree.h" @@ -37,17 +34,18 @@ namespace RadialMap { -struct Label +class Label { - Label(const RadialMap::Segment *s, int l) : segment(s), lvl(l), a(segment->start() + (segment->length() / 2)) { } +public: + Label(const RadialMap::Segment *s, int l) : segment(s), lvl(l), angle(segment->start() + (segment->length() / 2)) { } - bool tooClose(const int &aa) const { - return (a > aa - LABEL_ANGLE_MARGIN && a < aa + LABEL_ANGLE_MARGIN); + bool tooClose(const int otherAngle) const { + return (angle > otherAngle - LABEL_ANGLE_MARGIN && angle < otherAngle + LABEL_ANGLE_MARGIN); } const RadialMap::Segment *segment; const unsigned int lvl; - const int a; + const int angle; int x1, y1, x2, y2, x3; int tx, ty; @@ -55,40 +53,31 @@ QString qs; }; -class LabelList : public Q3PtrList