Skip to content

Commit

Permalink
Fork off Pop!_Shop
Browse files Browse the repository at this point in the history
  • Loading branch information
jackpot51 committed Nov 15, 2017
1 parent e957877 commit f8856e7
Show file tree
Hide file tree
Showing 27 changed files with 263 additions and 28 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build/
/debian/files
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set (PKGDATADIR "${DATADIR}/${CMAKE_PROJECT_NAME}")
set (CONFIGDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${CMAKE_PROJECT_NAME}")
set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
set (EXEC_NAME ${CMAKE_PROJECT_NAME})
set (APP_NAME "AppCenter")
set (APP_NAME "Pop!_Shop")
set (BLACKLIST "appcenter.blacklist")
set (RELEASE_NAME "Browse and manage apps")
set (DESKTOP_FILE ${CMAKE_PROJECT_NAME}.desktop)
Expand All @@ -18,7 +18,7 @@ set (VERSION "0.2.7")
set (VERSION_INFO "Alpha")
set (DOLLAR "$")

option (ENABLE_CURATED "Differentiate between apps created for elementary and not" ON)
option (ENABLE_CURATED "Differentiate between apps created for elementary and not" OFF)
set (CURATED_FLAG "")
if (ENABLE_CURATED)
set (CURATED_FLAG "--define=CURATED")
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Contributors to this repo agree to be bound by the [Code of Conduct](https://elementary.io/code-of-conduct) as made available on our website.
Contributors to this repo agree to be bound by the [Pop! Code of Conduct](https://github.com/pop-os/code-of-conduct).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# AppCenter
# Pop\!\_Shop
[![Translation status](https://l10n.elementary.io/widgets/appcenter/-/svg-badge.svg)](https://l10n.elementary.io/projects/appcenter/?utm_source=widget)
[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=57667267)](https://www.bountysource.com/teams/elementary/issues?tracker_ids=57667267)

An open, pay-what-you-want app store for indie developers.
An open, pay-what-you-want app store for indie developers. Based on the [Elementary AppCenter](https://github.com/elementary/appcenter)

![AppCenter Screenshot](data/screenshot.png?raw=true)
![Pop Shop Screenshot](data/screenshot.png?raw=true)

## Building, Testing, and Installation

Expand Down
2 changes: 2 additions & 0 deletions data/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ configure_file(${DESKTOP_FILE}.in.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
configure_file(${CMAKE_PROJECT_NAME}-daemon.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-daemon.desktop)
configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} ${CMAKE_SOURCE_DIR}/po/)
configure_file(${CMAKE_PROJECT_NAME}.service.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.service)
configure_file(${CMAKE_PROJECT_NAME}.search-provider.ini.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.search-provider.ini)
configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml ${CMAKE_SOURCE_DIR}/po/)

install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION share/applications)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-daemon.desktop DESTINATION share/applications)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.appdata.xml DESTINATION share/metainfo)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.search-provider.ini DESTINATION share/gnome-shell/search-providers)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.service DESTINATION share/dbus-1/services)
install (FILES ${BLACKLIST} DESTINATION ${CONFIGDIR})
11 changes: 6 additions & 5 deletions data/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@

.banner {
background-color: @banner_bg_color;
background-image: linear-gradient(to bottom right,
shade (@banner_bg_color, 1.05),
shade (@banner_bg_color, 0.95)
);
background-image: linear-gradient(@banner_bg_color, @banner_bg_color);
color: @banner_fg_color;
icon-shadow: none;
text-shadow: none;
Expand Down Expand Up @@ -80,6 +77,10 @@
text-shadow: 0 1px 1px alpha (@banner_fg_color, 0.1);
}

.banner progressbar {
color: @banner_fg_color;
}

.category {
background-image: linear-gradient(to bottom,
#fafafa,
Expand Down Expand Up @@ -306,5 +307,5 @@

.terminal selection {
background-color: #93a1a1;
color: #252e32;
color: #252e32;
}
19 changes: 8 additions & 11 deletions data/io.elementary.appcenter.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<component type="desktop-application">
<id>io.elementary.appcenter.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_group>elementary</project_group>
<project_group>pop</project_group>
<project_license>GPL-3.0+</project_license>
<_name>AppCenter</_name>
<_name>Pop!_Shop</_name>
<_summary>Browse and manage apps</_summary>
<description>
<_p>
An app store for indie and open source developers. Browse by categories or
search and discover new apps. AppCenter is also used for updating your
system to the latest and greatest version for new features and fixes.
Pop!_Shop
</_p>
</description>
<releases>
Expand Down Expand Up @@ -133,16 +131,15 @@
</provides>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/elementary/appcenter/master/data/screenshot.png</image>
<image>https://raw.githubusercontent.com/system76/pop-shop/master/data/screenshot.png</image>
</screenshot>
</screenshots>
<developer_name>elementary LLC.</developer_name>
<url type="homepage">http://elementary.io/</url>
<url type="bugtracker">https://github.com/elementary/appcenter/issues</url>
<url type="donation">https://elementary.io/get-involved#funding</url>
<developer_name>System76</developer_name>
<url type="homepage">https://github.com/system76/pop-shop</url>
<url type="bugtracker">https://github.com/system76/pop-shop/issues</url>
<url type="help">https://elementaryos.stackexchange.com/questions/tagged/appcenter</url>
<url type="translate">https://l10n.elementary.io/projects/desktop/appcenter</url>
<update_contact>contact_at_elementary.io</update_contact>
<update_contact>info_at_system76.com</update_contact>

<custom>
<value key="x-appcenter-color-primary">#665888</value>
Expand Down
5 changes: 5 additions & 0 deletions data/io.elementary.appcenter.search-provider.ini.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Shell Search Provider]
DesktopId=@[email protected]
BusName=@EXEC_NAME@
ObjectPath=/io/elementary/appcenter/SearchProvider
Version=2
Binary file modified data/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions debian/60pop-shop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Acquire::IndexTargets {
deb::DEP-11-icons {
DefaultEnabled "true";
};
};

#Acquire::IndexTargets {
# deb::DEP-11-icons-hidpi {
# DefaultEnabled "true";
# };
#};
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
43 changes: 43 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Source: pop-shop
Section: utils
Maintainer: Jeremy Soller <[email protected]>
Build-Depends: appstream,
cmake,
cmake-elementary,
debhelper (>= 9),
desktop-file-utils,
intltool,
libappstream-dev (>= 0.10),
libgee-0.8-dev,
libgranite-dev,
libgtk-3-dev,
libjson-glib-dev,
libpackagekit-glib2-dev,
libsoup2.4-dev,
libunity-dev,
libxml2-dev,
libxml2-utils,
valac (>= 0.26)
Standards-Version: 3.9.6
Homepage: https://github.com/pop/shop

Package: pop-shop
Architecture: any
Priority: extra
Depends: appstream, packagekit, ${misc:Depends}, ${shlibs:Depends}
Recommends: appstream-data-pop
Description: Fast application store
Install, update and remove apps with ease.
Helps independent developers.

Package: pop-shop-dbg
Architecture: any
Section: debug
Priority: extra
Depends: pop-shop (= ${binary:Version}), ${misc:Depends}
Enhances: pop-shop
Description: Fast application store (debugging symbols)
Install, update and remove apps with ease.
Helps independent developers.
.
This package contains debugging symbols for pop-shop.
24 changes: 24 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: pop-shop
Source: https://github.com/pop/shop

Files: src/* debian/*
Copyright: 2015 Corentin Noël <[email protected]>
License: GPL-3.0+

License: GPL-3.0+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
9 changes: 9 additions & 0 deletions debian/pop-shop.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
debian/60pop-shop /etc/apt/apt.conf.d/
etc/
usr/bin/
usr/share/applications/
usr/share/dbus-1/services/
usr/share/glib-2.0/
usr/share/gnome-shell/search-providers/
usr/share/locale/
usr/share/metainfo/
1 change: 1 addition & 0 deletions debian/pop-shop.links
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/share/applications/io.elementary.appcenter-daemon.desktop etc/xdg/autostart/io.elementary.appcenter-daemon.desktop
19 changes: 19 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1

%:
dh $@

override_dh_install:
dh_install --fail-missing

override_dh_strip:
dh_strip --dbg-package=pop-shop-dbg
1 change: 1 addition & 0 deletions debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (native)
2 changes: 1 addition & 1 deletion schemas/io.elementary.appcenter.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description>Window width</description>
</key>
<key type="i" name="window-height">
<default>640</default>
<default>660</default>
<summary>Window height</summary>
<description>Window height</description>
</key>
Expand Down
17 changes: 17 additions & 0 deletions src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public class AppCenter.App : Granite.Application {

private uint registration_id = 0;

private SearchProvider search_provider;
private uint search_provider_id = 0;

construct {
application_id = Build.PROJECT_NAME;
flags |= ApplicationFlags.HANDLES_OPEN;
Expand Down Expand Up @@ -91,6 +94,8 @@ public class AppCenter.App : Granite.Application {
add_action (quit_action);
add_action (show_updates_action);
add_accelerator ("<Control>q", "app.quit", null);

search_provider = new SearchProvider ();
}

public override void open (File[] files, string hint) {
Expand Down Expand Up @@ -191,6 +196,12 @@ public class AppCenter.App : Granite.Application {
} catch (Error e) {
warning (e.message);
}

try {
search_provider_id = connection.register_object ("/io/elementary/appcenter/SearchProvider", search_provider);
} catch (Error e) {
warning (e.message);
}
}

return true;
Expand All @@ -199,6 +210,12 @@ public class AppCenter.App : Granite.Application {
public override void dbus_unregister (DBusConnection connection, string object_path) {
if (registration_id != 0) {
connection.unregister_object (registration_id);
registration_id = 0;
}

if (search_provider_id != 0) {
connection.unregister_object (search_provider_id);
search_provider_id = 0;
}

base.dbus_unregister (connection, object_path);
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ vala_precompile(VALA_C ${EXEC_NAME}
Widgets/ReleaseRow.vala
Services/DBusInterfaces.vala
Services/DBusServer.vala
Services/SearchProvider.vala
${CMAKE_CURRENT_BINARY_DIR}/config.vala
PACKAGES
appstream
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Package.vala
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public class AppCenterCore.Package : Object {

public bool is_shareable {
get {
return !is_driver && !is_os_updates;
return false;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/Core/UpdateManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public class AppCenterCore.UpdateManager : Object {
notification.set_icon (new ThemedIcon ("system-software-install"));
notification.set_priority (NotificationPriority.URGENT);
notification.set_default_action ("app.open-application");
Application.get_default ().send_notification ("restart", notification);
}

restart_required = true;
Expand Down
Loading

0 comments on commit f8856e7

Please sign in to comment.