Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge nyanpasu to master #108

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Merge nyanpasu to master #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
973859c
Partial work
nyanpasu Apr 6, 2015
b6a4737
Update to sync
nyanpasu Apr 12, 2015
755c826
Daily update
nyanpasu Apr 12, 2015
6aa8568
Quick update
nyanpasu Apr 12, 2015
51cd17d
Daily update
nyanpasu Apr 12, 2015
6b615f8
Daily update
nyanpasu Apr 13, 2015
7b208bd
Daily update
nyanpasu Apr 14, 2015
6e5757e
Sync
nyanpasu Apr 14, 2015
202b077
Daily update
nyanpasu Apr 15, 2015
06f1e9a
Update
nyanpasu Apr 16, 2015
d177551
Break even more things
nyanpasu Apr 16, 2015
984eef4
Fix stuff, break stuff.
nyanpasu Apr 16, 2015
0119351
Fix columns
nyanpasu Apr 30, 2015
3627e4c
Set default column widths in resource files
nyanpasu May 7, 2015
5c1f48d
Add rss_box to the content_stack
nyanpasu May 7, 2015
7084917
Merge branch 'wip/rss2'
nyanpasu May 7, 2015
0a0a7b8
Add simple RSS widget box placeholder to the content stack
nyanpasu May 19, 2015
9d78cb6
Update comments, remove unused debugging messages, update onSec
nyanpasu May 20, 2015
1685b57
RSS widgets update
nyanpasu May 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ GRTAGS
.ycm_extra_conf.py
.ycm_extra_conf.pyc

gtorrent.log
.idea

gtorrent.log
docs
12 changes: 7 additions & 5 deletions assets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ ADD_CUSTOM_COMMAND (
COMMENT "Generating resources.c..."
COMMAND glib-compile-resources ARGS --target=${PROJECT_BINARY_DIR}/resources.c --generate-source resources.xml
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/window_main.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/panel_info.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_association.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_settings.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_rss.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_generic.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_function.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_generic.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_rss.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_settings.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_box_rss.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_box_torrent.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_panel_torrent.ui
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/window_main.ui
)

ADD_CUSTOM_COMMAND (
Expand Down
Loading