FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some tiny changes, adjusted OS2 icon handling.

Browse Source
This commit is contained in:
Martin Rotter 2014-07-21 21:30:02 +02:00
parent e795b22df3
commit 3bf8262577
10 changed files with 184 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -23,6 +23,9 @@
# the application and application will run in iconless mode. # the application and application will run in iconless mode.
# Default and recommended value is "ON". # Default and recommended value is "ON".
# #
# "-DENABLE_OS2_RC=OFF"
# If "ON" then icon is compiled into executable file on OS/2. Defaults to "OFF".
#
# Other information: # Other information:
# - supports Windows, Linux, OS/2 (eComStation), # - supports Windows, Linux, OS/2 (eComStation),
# - Qt 4.7.3 and higher is required, # - Qt 4.7.3 and higher is required,
@ -64,6 +67,7 @@ endif(APPLE)
# Options declaration. # Options declaration.
option(USE_QT_5 "Use Qt 5 for building" OFF) option(USE_QT_5 "Use Qt 5 for building" OFF)
option(ENABLE_OS2_RC "Compile application icon on OS/2" OFF)
option(BUNDLE_ICON_THEMES "Equip installation with custom icon themes" ON) option(BUNDLE_ICON_THEMES "Equip installation with custom icon themes" ON)
if(POLICY CMP0012) if(POLICY CMP0012)
@ -230,7 +234,7 @@ if(WIN32)
${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_win.rc.in ${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_win.rc.in
${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.rc ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.rc
) )
elseif(OS2) elseif(OS2 AND ${ENABLE_OS2_RC})
message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for OS2.") message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for OS2.")
configure_file ( configure_file (
${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_os2.rc.in ${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_os2.rc.in
@ -251,17 +255,20 @@ if(MINGW AND WIN32)
${APP_SOURCES} ${APP_SOURCES}
${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.rc) ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_win.rc)
elseif(OS2) elseif(OS2)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
if(${ENABLE_OS2_RC})
enable_language(RC) enable_language(RC)
set(CMAKE_RC_COMPILER_INIT rc) set(CMAKE_RC_COMPILER_INIT rc)
message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for OS2.") message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for OS2.")
message(STATUS "[${APP_LOW_NAME}] Used tool is: ${CMAKE_RC_COMPILER}") message(STATUS "[${APP_LOW_NAME}] Used tool is: ${CMAKE_RC_COMPILER}")
set(CMAKE_RC_COMPILE_OBJECT set(CMAKE_RC_COMPILE_OBJECT
"<CMAKE_RC_COMPILER> -n -r <SOURCE> <OBJECT>") "<CMAKE_RC_COMPILER> -n -r <SOURCE> <OBJECT>")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
set(APP_SOURCES set(APP_SOURCES
${APP_SOURCES} ${APP_SOURCES}
${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc) ${CMAKE_CURRENT_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc)
endif(${ENABLE_OS2_RC})
elseif(WIN32 AND MSVC) elseif(WIN32 AND MSVC)
# MSVC takes care of this automatically - no need to use windres.exe # MSVC takes care of this automatically - no need to use windres.exe
# for MSVC compilers. # for MSVC compilers.
@ -305,6 +312,7 @@ set(APP_SOURCES
src/gui/feedstoolbar.cpp src/gui/feedstoolbar.cpp
src/gui/toolbareditor.cpp src/gui/toolbareditor.cpp
src/gui/messagessearchlineedit.cpp src/gui/messagessearchlineedit.cpp
src/gui/formexport.cpp
# DYNAMIC-SHORTCUTS sources. # DYNAMIC-SHORTCUTS sources.
src/dynamic-shortcuts/shortcutcatcher.cpp src/dynamic-shortcuts/shortcutcatcher.cpp
@ -386,6 +394,7 @@ set(APP_HEADERS
src/gui/feedstoolbar.h src/gui/feedstoolbar.h
src/gui/toolbareditor.h src/gui/toolbareditor.h
src/gui/messagessearchlineedit.h src/gui/messagessearchlineedit.h
src/gui/formexport.h
# DYNAMIC-SHORTCUTS headers. # DYNAMIC-SHORTCUTS headers.
src/dynamic-shortcuts/dynamicshortcutswidget.h src/dynamic-shortcuts/dynamicshortcutswidget.h
@ -430,6 +439,7 @@ set(APP_FORMS
src/gui/formcategorydetails.ui src/gui/formcategorydetails.ui
src/gui/formfeeddetails.ui src/gui/formfeeddetails.ui
src/gui/toolbareditor.ui src/gui/toolbareditor.ui
src/gui/formexport.ui
) )
# APP translations. # APP translations.

18
resources/text/CHANGELOG
View File

@ -1,4 +1,22 @@
<body> <body>
<center><h2>2.0.0.0</h2></center>
Fixed:
<ul>
<li>/li>
</ul>
Added:
<ul>
<li></li>
</ul>
Changed:
<ul>
<li>Updated bundled OpenSSL libraries for Windows portable version.</li>
</ul>
<hr/>
<center><h2>1.9.9.9</h2></center> <center><h2>1.9.9.9</h2></center>
Fixed: Fixed:

15
src/gui/feedmessageviewer.cpp
View File

@ -33,6 +33,7 @@
#include "gui/messagebox.h" #include "gui/messagebox.h"
#include "gui/messagestoolbar.h" #include "gui/messagestoolbar.h"
#include "gui/feedstoolbar.h" #include "gui/feedstoolbar.h"
#include "gui/formexport.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QSplitter> #include <QSplitter>
@ -205,6 +206,12 @@ void FeedMessageViewer::createConnections() {
connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)),
m_messagesBrowser, SLOT(navigateToMessages(QList<Message>))); m_messagesBrowser, SLOT(navigateToMessages(QList<Message>)));
// Import & export of feeds.
connect(form_main->m_ui->m_actionExportFeeds, SIGNAL(triggered()),
this, SLOT(exportFeeds()));
connect(form_main->m_ui->m_actionImportFeeds, SIGNAL(triggered()),
this, SLOT(importFeeds()));
// If user selects feeds, load their messages. // If user selects feeds, load their messages.
connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)), connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)),
m_messagesView, SLOT(loadFeeds(QList<int>))); m_messagesView, SLOT(loadFeeds(QList<int>)));
@ -436,3 +443,11 @@ void FeedMessageViewer::refreshVisualProperties() {
m_toolBarFeeds->setToolButtonStyle(button_style); m_toolBarFeeds->setToolButtonStyle(button_style);
m_toolBarMessages->setToolButtonStyle(button_style); m_toolBarMessages->setToolButtonStyle(button_style);
} }
void FeedMessageViewer::importFeeds() {
// TODO: todo
}
void FeedMessageViewer::exportFeeds() {
// TODO: todo
}

5
src/gui/feedmessageviewer.h
View File

@ -89,6 +89,11 @@ class FeedMessageViewer : public TabContent {
// Reloads some changeable visual settings. // Reloads some changeable visual settings.
void refreshVisualProperties(); void refreshVisualProperties();
// Displays dialog for export/import of feeds
// in various formats + does the whole job.
void importFeeds();
void exportFeeds();
protected slots: protected slots:
// Updates counts of messages for example in tray icon. // Updates counts of messages for example in tray icon.
void updateTrayIconStatus(int unread_messages, int total_messages); void updateTrayIconStatus(int unread_messages, int total_messages);

14
src/gui/formexport.cpp Normal file
View File

@ -0,0 +1,14 @@
#include "formexport.h"
#include "ui_formexport.h"
FormExport::FormExport(QWidget *parent) :
QDialog(parent),
ui(new Ui::FormExport)
{
ui->setupUi(this);
}
FormExport::~FormExport()
{
delete ui;
}

22
src/gui/formexport.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef FORMEXPORT_H
#define FORMEXPORT_H
#include <QDialog>
namespace Ui {
class FormExport;
}
class FormExport : public QDialog
{
Q_OBJECT
public:
explicit FormExport(QWidget *parent = 0);
~FormExport();
private:
Ui::FormExport *ui;
};
#endif // FORMEXPORT_H

68
src/gui/formexport.ui Normal file
View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FormExport</class>
<widget class="QDialog" name="FormExport">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QDialogButtonBox" name="m_buttonBox">
<property name="geometry">
<rect>
<x>50</x>
<y>250</y>
<width>341</width>
<height>32</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</widget>
<resources/>
<connections>
<connection>
<sender>m_buttonBox</sender>
<signal>accepted()</signal>
<receiver>FormExport</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>m_buttonBox</sender>
<signal>rejected()</signal>
<receiver>FormExport</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

3
src/gui/formmain.cpp
View File

@ -93,7 +93,8 @@ QHash<QString, QAction*> FormMain::allActions() {
// Add basic actions. // Add basic actions.
actions.insert(m_ui->m_actionSettings->objectName(), m_ui->m_actionSettings); actions.insert(m_ui->m_actionSettings->objectName(), m_ui->m_actionSettings);
actions.insert(m_ui->m_actionSettings->objectName(), m_ui->m_actionSettings); actions.insert(m_ui->m_actionImportFeeds->objectName(), m_ui->m_actionImportFeeds);
actions.insert(m_ui->m_actionExportFeeds->objectName(), m_ui->m_actionExportFeeds);
actions.insert(m_ui->m_actionQuit->objectName(), m_ui->m_actionQuit); actions.insert(m_ui->m_actionQuit->objectName(), m_ui->m_actionQuit);
actions.insert(m_ui->m_actionFullscreen->objectName(), m_ui->m_actionFullscreen); actions.insert(m_ui->m_actionFullscreen->objectName(), m_ui->m_actionFullscreen);
actions.insert(m_ui->m_actionAboutGuard->objectName(), m_ui->m_actionAboutGuard); actions.insert(m_ui->m_actionAboutGuard->objectName(), m_ui->m_actionAboutGuard);

19
src/gui/formmain.ui
View File

@ -55,6 +55,9 @@
<property name="title"> <property name="title">
<string>&amp;File</string> <string>&amp;File</string>
</property> </property>
<addaction name="m_actionImportFeeds"/>
<addaction name="m_actionExportFeeds"/>
<addaction name="separator"/>
<addaction name="m_actionQuit"/> <addaction name="m_actionQuit"/>
</widget> </widget>
<widget class="QMenu" name="m_menuHelp"> <widget class="QMenu" name="m_menuHelp">
@ -530,6 +533,22 @@
<string notr="true">H</string> <string notr="true">H</string>
</property> </property>
</action> </action>
<action name="m_actionImportFeeds">
<property name="text">
<string>&amp;Import feeds</string>
</property>
<property name="toolTip">
<string>Imports feeds you want from selected file.</string>
</property>
</action>
<action name="m_actionExportFeeds">
<property name="text">
<string>&amp;Export feeds</string>
</property>
<property name="toolTip">
<string>Imports feeds you want to selected file.</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>