mirror of
https://bitbucket.org/smil3y/kde-playground.git
synced 2025-02-23 10:22:50 +00:00
generic: adjust
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
134d60c30c
commit
973b98117c
10 changed files with 13 additions and 13 deletions
|
@ -1,6 +1,8 @@
|
||||||
project(karchivemanager)
|
project(karchivemanager)
|
||||||
|
|
||||||
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
include(FeatureSummary)
|
||||||
|
|
||||||
find_package(KDE4 4.19.0 REQUIRED)
|
find_package(KDE4 4.19.0 REQUIRED)
|
||||||
include(KDE4Defaults)
|
include(KDE4Defaults)
|
||||||
include_directories(${KDE4_INCLUDES})
|
include_directories(${KDE4_INCLUDES})
|
||||||
|
|
|
@ -4,7 +4,6 @@ project(kcachegrind)
|
||||||
|
|
||||||
find_package(KDE4 4.14.3 REQUIRED)
|
find_package(KDE4 4.14.3 REQUIRED)
|
||||||
include(KDE4Defaults)
|
include(KDE4Defaults)
|
||||||
include(MacroLibrary)
|
|
||||||
|
|
||||||
set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS )
|
set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS )
|
||||||
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
||||||
|
|
|
@ -465,7 +465,6 @@
|
||||||
<tabstop>buttonBox</tabstop>
|
<tabstop>buttonBox</tabstop>
|
||||||
<tabstop>dirList</tabstop>
|
<tabstop>dirList</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
|
||||||
<connections>
|
<connections>
|
||||||
<connection>
|
<connection>
|
||||||
<sender>classCheck</sender>
|
<sender>classCheck</sender>
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
project(kgpg)
|
project(kgpg)
|
||||||
|
|
||||||
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
include(FeatureSummary)
|
||||||
|
|
||||||
find_package(KDE4 4.21.0 REQUIRED)
|
find_package(KDE4 4.21.0 REQUIRED)
|
||||||
include(KDE4Defaults)
|
include(KDE4Defaults)
|
||||||
include_directories(${KDE4_INCLUDES})
|
include_directories(${KDE4_INCLUDES})
|
||||||
|
|
|
@ -402,6 +402,5 @@
|
||||||
<header>kurlrequester.h</header>
|
<header>kurlrequester.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -206,6 +206,5 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -13,7 +13,7 @@ set(kman_sources
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(kman ${kman_sources})
|
add_executable(kman ${kman_sources})
|
||||||
target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS})
|
target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KARCHIVE_LIBS})
|
||||||
|
|
||||||
install(TARGETS kman DESTINATION ${KDE4_BIN_INSTALL_DIR})
|
install(TARGETS kman DESTINATION ${KDE4_BIN_INSTALL_DIR})
|
||||||
install(FILES kmanui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman)
|
install(FILES kmanui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman)
|
||||||
|
|
|
@ -82,6 +82,5 @@
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QStatusBar" name="statusbar"/>
|
<widget class="QStatusBar" name="statusbar"/>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
#include <KStatusBar>
|
#include <KStatusBar>
|
||||||
#include <KFileDialog>
|
#include <KFileDialog>
|
||||||
#include <KFilterDev>
|
#include <KDecompressor>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QFileSystemWatcher>
|
#include <QFileSystemWatcher>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
@ -369,12 +369,14 @@ QString KManMainWindow::manContent(const QString &path) {
|
||||||
|
|
||||||
QByteArray content;
|
QByteArray content;
|
||||||
if (path.endsWith(".gz") || path.endsWith(".bz2") || path.endsWith(".xz")) {
|
if (path.endsWith(".gz") || path.endsWith(".bz2") || path.endsWith(".xz")) {
|
||||||
QIODevice *archivedevice = KFilterDev::deviceForFile(path);
|
if (pathfile.open(QFile::ReadOnly)) {
|
||||||
if (archivedevice) {
|
QByteArray compressedcontent = pathfile.readAll();
|
||||||
if (archivedevice->open(QFile::ReadOnly)) {
|
KDecompressor kdecompressor;
|
||||||
content = archivedevice->readAll();
|
kdecompressor.setType(KDecompressor::typeForFile(path));
|
||||||
|
if (!kdecompressor.process(compressedcontent)) {
|
||||||
|
kWarning() << kdecompressor.errorString();
|
||||||
}
|
}
|
||||||
archivedevice->deleteLater();
|
content = kdecompressor.result();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (pathfile.open(QFile::ReadOnly)) {
|
if (pathfile.open(QFile::ReadOnly)) {
|
||||||
|
|
|
@ -217,6 +217,5 @@
|
||||||
<header>knuminput.h</header>
|
<header>knuminput.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
Loading…
Add table
Reference in a new issue