Skip to content
This repository has been archived by the owner on May 8, 2019. It is now read-only.

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@bpasero
bpasero committed Apr 27, 2013
1 parent 6ab45f8 commit 8a078cc
Show file tree
Hide file tree
Showing 26 changed files with 248 additions and 27 deletions.
2 changes: 1 addition & 1 deletion org.rssowl.core.tests/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: org.rssowl.core.tests;singleton:=true
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: RSSOwl.org
Require-Bundle: org.eclipse.core.runtime,
org.rssowl.lib.jdom,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.core;singleton:=true
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.rssowl.core.internal.Activator
Eclipse-RegisterBuddy: org.rssowl.lib.db4o, org.rssowl.lib.httpclient
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.feature.eclipse/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.rssowl.eclipse"
label="RSSOwl in Eclipse"
version="2.1.6.qualifier"
version="2.2.0.qualifier"
provider-name="RSSOwl.org"
plugin="org.rssowl.ui">

Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.feature.tests/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.rssowl.tests"
label="RSSOwl Tests Feature"
version="2.1.6.qualifier"
version="2.2.0.qualifier"
provider-name="RSSOwl.org">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.feature/feature.xml
View file
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.rssowl"
label="RSSOwl"
version="2.1.6.qualifier"
version="2.2.0.qualifier"
provider-name="RSSOwl.org"
plugin="org.rssowl.ui">

Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.lib.db4o/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.lib.db4o
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Eclipse-BuddyPolicy: registered
Bundle-Vendor: %Bundle-Vendor
Export-Package: com.db4o,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.lib.httpclient/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.lib.httpclient
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Eclipse-BuddyPolicy: registered
Export-Package: org.apache.commons.codec,
org.apache.commons.codec.binary,
Expand Down
1 change: 0 additions & 1 deletion org.rssowl.lib.jdom/.settings/org.eclipse.core.resources.prefs
View file
@@ -1,3 +1,2 @@
#Thu Apr 06 21:17:18 CEST 2006
eclipse.preferences.version=1
encoding/<project>=UTF-8
2 changes: 1 addition & 1 deletion org.rssowl.lib.jdom/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.lib.jdom
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Eclipse-BuddyPolicy: registered
Bundle-Vendor: %Bundle-Vendor
Export-Package: .,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.lib.lucene/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.lib.lucene
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Export-Package: org.apache.lucene,
org.apache.lucene.analysis,
org.apache.lucene.analysis.standard,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.rssowl.ui; singleton:=true
Bundle-Version: 2.1.6.qualifier
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.rssowl.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.ui/about.ini
View file
Expand Up @@ -7,7 +7,7 @@
# Property "aboutText" contains blurb for "About" dialog (translated)
aboutText=RSSOwl\n\
\n\
Version: 2.1.6\n\
Version: 2.2.0\n\
Build id: 2012-12-08\n\
\n\
(c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved.\n\
Expand Down
4 changes: 2 additions & 2 deletions org.rssowl.ui/config.ini
View file
Expand Up @@ -32,10 +32,10 @@ eclipse.product=org.rssowl.ui.product
osgi.instance.area.default=@user.home/.rssowl2

# The default configuration location
osgi.configuration.area=@user.home/.rssowl2/config216
osgi.configuration.area=@user.home/.rssowl2/config220

# Version Information
rssowl.buildId=2.1.6
rssowl.buildId=2.2.0

# End of file marker - must be here
eof=eof
2 changes: 1 addition & 1 deletion org.rssowl.ui/plugin.eclipse.xml
View file
Expand Up @@ -756,7 +756,7 @@
value="icons/product/16x16.png,icons/product/32x32.png,icons/product/48x48.png,icons/product/64x64.png,icons/product/128x128.png"/>
<property
name="aboutText"
value="RSSOwl&#x0D;&#x0A;&#x0D;&#x0A;Version: 2.1.6&#x0D;&#x0A;Build Id: 2012-12-08&#x0D;&#x0A;&#x0D;&#x0A;RSSOwl is licensed under the terms of the Eclipse Public License version 1.0.&#x0D;&#x0A;http://www.rssowl.org/legal/epl-v10.html&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/>
value="RSSOwl&#x0D;&#x0A;&#x0D;&#x0A;Version: 2.2.0&#x0D;&#x0A;Build Id: 2012-12-08&#x0D;&#x0A;&#x0D;&#x0A;RSSOwl is licensed under the terms of the Eclipse Public License version 1.0.&#x0D;&#x0A;http://www.rssowl.org/legal/epl-v10.html&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/>
<property
name="preferenceCustomization"
value="preferences.ini"/>
Expand Down
3 changes: 2 additions & 1 deletion org.rssowl.ui/plugin.properties
View file
Expand Up @@ -308,4 +308,5 @@ action.label.38 = &Download Additional Languages...
menu.label.4 = &Language
action.label.39 = &Translate RSSOwl...
shareProvider.name.26 = Google Plus
shareProvider.name.27 = Readability
shareProvider.name.27 = Readability
action.label.40 = Unsubscribe from Google Reader
10 changes: 9 additions & 1 deletion org.rssowl.ui/plugin.xml
View file
Expand Up @@ -382,6 +382,14 @@
menubarPath="tools/end"
style="push">
</action>-->
<action
class="org.rssowl.ui.internal.actions.UnsubscribeGoogleReaderAction"
icon="icons/elcl16/reader.gif"
id="org.rssowl.ui.UnsubscribeGoogleReaderAction"
label="%action.label.40"
menubarPath="tools/end"
style="push">
</action>
<action
class="org.rssowl.ui.internal.actions.ShowActivityAction"
definitionId="org.rssowl.ui.ShowActivityAction"
Expand Down Expand Up @@ -960,7 +968,7 @@
value="icons/product/16x16.png,icons/product/32x32.png,icons/product/48x48.png,icons/product/64x64.png,icons/product/128x128.png"/>
<property
name="aboutText"
value="RSSOwl&#x0D;&#x0A;&#x0D;&#x0A;Version: 2.1.6&#x0D;&#x0A;Build Id: 2012-12-08&#x0D;&#x0A;&#x0D;&#x0A;RSSOwl is licensed under the terms of the Eclipse Public License version 1.0.&#x0D;&#x0A;http://www.rssowl.org/legal/epl-v10.html&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/>
value="RSSOwl&#x0D;&#x0A;&#x0D;&#x0A;Version: 2.2.0&#x0D;&#x0A;Build Id: 2012-12-08&#x0D;&#x0A;&#x0D;&#x0A;RSSOwl is licensed under the terms of the Eclipse Public License version 1.0.&#x0D;&#x0A;http://www.rssowl.org/legal/epl-v10.html&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright RSSOwl contributors and others 2005, 2011. All rights reserved."/>
<property
name="preferenceCustomization"
value="preferences.ini"/>
Expand Down
6 changes: 3 additions & 3 deletions org.rssowl.ui/rssowl.product
View file
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="RSSOwl" uid="2.1.6" id="org.rssowl.ui.product" application="org.rssowl.ui.rssowl" useFeatures="true" includeLaunchers="true">
<product name="RSSOwl" uid="2.2.0" id="org.rssowl.ui.product" application="org.rssowl.ui.rssowl" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/org.rssowl.ui/icons/product/about.gif"/>
<text>
RSSOwl

Version: 2.1.6
Version: 2.2.0
Build Id: 2012-12-08

RSSOwl is licensed under the terms of the Eclipse Public License version 1.0.
Expand Down Expand Up @@ -74,7 +74,7 @@ RSSOwl Development Team - initial API and implementation
<features>
<feature id="org.eclipse.rcp" version="3.4.200.R342_v20090122-989JESTEbig-SVaL8UJHcYBr4A63"/>
<feature id="org.rssowl.dependencies" version="2.0.0"/>
<feature id="org.rssowl" version="2.1.6.qualifier"/>
<feature id="org.rssowl" version="2.2.0.qualifier"/>
</features>


Expand Down
4 changes: 2 additions & 2 deletions org.rssowl.ui/rssowl_installer.nsi
View file
Expand Up @@ -30,14 +30,14 @@
*/

;##### Variables ######
!define VER_DISPLAY "2.1.6"
!define VER_DISPLAY "2.2.0"

;##### Include Modern UI ######
!include "MUI.nsh"

;##### Installer Configuration ######
Name "RSSOwl"
OutFile "RSSOwl Setup 2.1.6.exe"
OutFile "RSSOwl Setup 2.2.exe"
InstallDir $PROGRAMFILES\RSSOwl
InstallDirRegKey HKCU "Software\RSSOwl" ""
AllowRootDirInstall true
Expand Down
2 changes: 1 addition & 1 deletion org.rssowl.ui/src/org/rssowl/ui/internal/SplashHandler.java
View file
Expand Up @@ -94,7 +94,7 @@ private void initComponents(Shell shell) {
versionLabel.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));
versionLabel.setFont(fVersionFont);
versionLabel.setForeground(fVersionColor);
versionLabel.setText(NLS.bind(Messages.SplashHandler_BUILD, "2.1.6")); //$NON-NLS-1$
versionLabel.setText(NLS.bind(Messages.SplashHandler_BUILD, "2.2")); //$NON-NLS-1$

/* Layout All */
shell.layout(true, true);
Expand Down
5 changes: 5 additions & 0 deletions org.rssowl.ui/src/org/rssowl/ui/internal/actions/Messages.java
View file
Expand Up @@ -131,6 +131,11 @@ public class Messages extends NLS {

public static String ToggleReadStateAction_NEWS_READ;
public static String ToggleReadStateAction_NEWS_READ_BINDING;
public static String UnsubscribeGoogleReaderAction_0;
public static String UnsubscribeGoogleReaderAction_1;
public static String UnsubscribeGoogleReaderAction_2;
public static String UnsubscribeGoogleReaderAction_3;
public static String UnsubscribeGoogleReaderAction_4;

private Messages() {}

Expand Down

0 comments on commit 8a078cc

Please sign in to comment.