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.

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

Add view/edit/save support for 1.10 conky confs also. #1

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
d8922b6
Added Dutch translation
Vistaus May 7, 2017
051d69e
Add recognition to load conky 1.10 conf files
zcot Feb 7, 2018
015e217
support load/edit/save conky of 1.10 conf
zcot Feb 7, 2018
550076f
change get_value funct to also read conky 1.10 conf
zcot Feb 8, 2018
ce92f01
get_value catches lua quoted vars. version switches for set_value
zcot Feb 8, 2018
3b0fbaa
fixup load widget for 1.10 confs
zcot Feb 8, 2018
76c2fa7
option for miminum_height + minimum_width for 1.10 confs
zcot Feb 8, 2018
56a9c8c
fixup apply-save widget for 1.10 confs
zcot Feb 8, 2018
5cf2c91
version switch for window size for apply-save widget for 1.10 confs
zcot Feb 8, 2018
57da0ee
allow height padding READ to account for 1.10 conf lua text block
zcot Feb 8, 2018
d4c45bd
add height-padding WRITE, for 1.10 conf lua text block
zcot Feb 9, 2018
f1b5a93
adjust 'transparency' scheme for 1.10 lua true/false vars
zcot Feb 9, 2018
0e3ed03
fix apply-save bug: write window_argb_value after 'transparency', so …
zcot Feb 9, 2018
2c9f34f
Add simple build instructions.
zcot Jul 10, 2018
e90ada1
Merge branch 'master' of https://github.com/Vistaus/conky-manager int…
zcot Jul 11, 2018
78ef557
Merge branch 'Vistaus-master' into add-1.10-support
zcot Jul 11, 2018
8cd6f91
Transition to conky-manager2
zcot Jul 15, 2018
815842d
Continuing conky-manager2 transition
zcot Jul 15, 2018
4777be7
fix bug in Croatian language header
zcot Jul 15, 2018
b3d8f3b
Continuing conky-manager2 transition
zcot Jul 15, 2018
11c697c
Integration of Dutch translation by Vistaus
zcot Jul 15, 2018
45cdaf1
Add vanity label :p
zcot Jul 15, 2018
33510e3
Add vanity label correction :D
zcot Jul 15, 2018
b922120
Icons get transitioned to conky-manager2
zcot Jul 15, 2018
20579a1
Updated info
zcot Jul 16, 2018
29e119c
Use .md format now
zcot Jul 16, 2018
c55ae12
Update build info
zcot Jul 16, 2018
df7618d
Update build info for macOS
zcot Jul 16, 2018
fe735f9
Add Portuguese translation from Brazil
tioguda Feb 12, 2019
a10b1d8
update-default-themes-NVIDIA-for-BOM
invalid-email-address Feb 13, 2019
596cc00
Merge pull request #5 from tioguda/add-1.10-support
zcot Feb 17, 2019
8cf46ba
Merge pull request #6 from jamartin9/remove-nvidia-bom
zcot Feb 17, 2019
442c772
Add ability to import various non ConkyManagerTheme(cmtp.7z) designed…
zcot Feb 21, 2019
533b008
add tioguda credit for Portuguese Brazil translation
zcot Feb 21, 2019
c2ac9d3
credit THANKS for jamartin9 remove-nvidia-bom marker from nvidia theme
zcot Feb 21, 2019
b2fe492
bump version to 2.6
zcot Feb 21, 2019
628f9f4
Integrate Portuguese translation from Brazil
tioguda Feb 21, 2019
663214c
Merge pull request #7 from tioguda/add-1.10-support
zcot Feb 21, 2019
cfae13f
Update Brazilian Portuguese translation
tioguda Feb 21, 2019
8923588
Merge pull request #8 from tioguda/add-1.10-support
zcot Feb 21, 2019
824b3b2
Removed negative time value
horgan Oct 9, 2019
5b4daab
add 'if_up' and 'addr' to network edit widget
zcot Nov 23, 2019
26aa6a1
Merge branch 'add-1.10-support' of https://github.com/zcot/conky-mana…
zcot Nov 23, 2019
d0d6cb2
Merge pull request #13 from horgan/patch-2
zcot Nov 23, 2019
fae7a7d
added French translations
fehlix May 2, 2020
8ff8391
merged French translations from default branch
fehlix May 2, 2020
aa5f2e2
adjust lua format detection and desktop-session in startup
fehlix May 2, 2020
ea70cde
update requirements
renyhp May 17, 2020
daa1b4a
Merge pull request #17 from renyhp/patch-1
zcot Feb 2, 2021
da8532b
Support meson (#19)
afelinczak Feb 2, 2021
71bbf1f
added german translation (#22)
freddii Feb 2, 2021
700ef97
clean old po design, add credits
zcot Feb 2, 2021
43fcced
credit
zcot Feb 3, 2021
71ff03b
Merge pull request #16 from fehlix/add-1.10-support
zcot Feb 4, 2021
d065b5b
clean up translation, credit
zcot Feb 4, 2021
59385ce
remove old format naming translation files
zcot Feb 4, 2021
265ed96
french
zcot Feb 5, 2021
a368692
to version 2.72
zcot Feb 14, 2021
2c599ef
allow conky or conky-all dependency
zcot Feb 25, 2021
cb428f0
allow other conky package dependencies
zcot Mar 1, 2021
09b043d
added korean translation
yeji0407 May 28, 2021
0daf3b7
Fixed debian control files for lintian errors
mok0 Sep 23, 2021
c97bcaa
Clean up ConkyManager2 icon
mok0 Sep 23, 2021
eeda3b8
Merge pull request #25 from yeji0407/add-1.10-support
zcot Nov 22, 2021
f5bfa3f
Merge pull request #26 from mok0/fix-debian-control
zcot Nov 22, 2021
6ff38b5
Small updates, Korean translation, debian packaging changes, icon art…
zcot Nov 22, 2021
1b63f59
implement man
zcot Nov 23, 2021
e76c750
For debugging configs, implement Open In Terminal
zcot Nov 27, 2021
9dc2730
multiple adjustments
zcot May 30, 2022
208b23d
use xdg feature instead of exo for editor
zcot May 31, 2022
d292c95
convert original themepack to 1.10 lua configs
zcot May 31, 2022
e41aaf3
get the lunch money
zcot Jun 2, 2022
85fd0b3
allow null DESKTOP_SESSION
zcot Jun 3, 2023
636b298
add teejee2008 autoupdate-ppa information
zcot Jun 4, 2023
ee1d3fe
add .deb file instruction
zcot Jun 4, 2023
251ef0c
fix default themepack autoinstall
zcot Sep 3, 2023
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
2 changes: 1 addition & 1 deletion .bzrignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src/conky-manager
src/conky-manager2
installer/amd64
installer/i386
installer/*.deb
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src/conky-manager
src/conky-manager2
installer/amd64
installer/i386
installer/*.deb
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

Copyright (C) 2018 Scott Caudle ([email protected])
Copyright (C) 2013 Tony George ([email protected])

50 changes: 50 additions & 0 deletions HOWTOBUILD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# How to build this software. It was tested on Mint 18.x and 19 versions, but will probably build just the same on the various *ubuntu systems too.

## additional required packages to build:
build-essential
git
valac
libgee-0.8-dev
libgtk-3-dev
libjson-glib-dev
gettext
libgettextpo-dev

## additional required run time packages:
p7zip-full
imagemagick

## here is a one-shot installation command for all of the above packages:
```
apt install build-essential git valac libgee-0.8-dev libgtk-3-dev libjson-glib-dev gettext libgettextpo-dev p7zip-full imagemagick
```


## clone this repository
the following command will create a subdirectory from whatever directory you are currently in called conky-manager2 then download the files from github and put them in that subdirectory:
```
git clone https://github.com/zcot/conky-manager2.git
```

## change the directory to that source code location:
```
cd conky-manager2
```

## compile the source:
```
make
```
( follow instructions here to build a `.deb` file instead: https://gist.github.com/zcot/ff43f40ceaf970623bfd18ead1bd65b2 )
## install the finished program into the local file system:
```
sudo make install
```

## can be uninstalled as follows:
```
sudo make uninstall
```



2 changes: 2 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Please see file HOWTOBUILD.md

Installation Instructions
*************************

Expand Down
7 changes: 0 additions & 7 deletions README

This file was deleted.

34 changes: 34 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

Conky Manager
=======================

Simple tool for managing Conky configs.
...

# Conky Manager 2 - a newer conky config manager

This is a fork of the old original Conky Manager by teejee2008(Tony George).

This latest version supports Ubuntu 16-22 versions as well as Mint 18-21.x and any other Ubuntu flavor or derivative.

It also provides support for the newer lua-based conky and configuration files(v1.10)


## Installation

**For Ubuntu and derivatives:**

```bash
sudo add-apt-repository ppa:teejee2008/foss
sudo apt update
sudo apt install conky-manager2
```

**Other Distributions**

Right now, the alternate installation method is to download and compile this source package, but it's only a few simple commands. It will provide `make install` as well as building a `.deb`.

Please see document [HOWTOBUILD.md](./HOWTOBUILD.md)

(macOS note: To build this newer version for macOS you can use the git software if it is installed. Please see the 2 instructions in the following HOWTOBUILD.md document on how to [clone this repository](./HOWTOBUILD.md#clone-this-repository) -Alternately, you can use the magic green button to download the zip file, and then you extract it. Be sure to open Terminal into the source file directory. Then to do the actual software build and installation, follow the instructions provided here: [https://github.com/npyl/conky-manager](https://github.com/npyl/conky-manager#conky-manager) )

12 changes: 12 additions & 0 deletions THANKS
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
mok0 various debian packaging fixes, changes dev-art icon to actual quality artwork:)
yeji0407 adds Korean translation
fehlix added French translation, more lua-format detection, lua_load changes
freddii for German translation
afelinczak adds ninja meson support with vscode
renyhp finds missing build deps for Ubuntu variations.
horgan - no negative time value settings allowed
jamartin9 pull request remove-nvidia-bom marker from default nvidia theme
tioguda for Portuguese - Brazil translation
Vistaus for Dutch translation!
littledipper from Linux Mint IRC #linuxmint-help

2 changes: 1 addition & 1 deletion build-installer.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

app_name='conky-manager'
app_name='conky-manager2'
app_fullname='Conky Manager'
tgz="../../pbuilder/"
dsc="../../builds/${app_name}*.dsc"
Expand Down
32 changes: 16 additions & 16 deletions conky-manager.geany
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ detect_indent_width=false
indent_mode=2

[project]
name=conky-manager
base_path=/home/teejee/projects/linux/conky-manager/
name=conky-manager2
base_path=/home/teejee/projects/linux/conky-manager2/
description=
file_patterns=

Expand All @@ -24,18 +24,18 @@ long_line_column=72

[files]
current_page=8
FILE_NAME_0=30;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FAboutWindow.vala;0;4
FILE_NAME_1=33;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FDonationWindow.vala;0;4
FILE_NAME_2=34;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FEditThemeWindow.vala;0;4
FILE_NAME_3=35;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FEditWidgetWindow.vala;0;4
FILE_NAME_4=2589;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FGeneratePreviewWindow.vala;0;4
FILE_NAME_5=21828;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FMain.vala;0;4
FILE_NAME_6=29;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_7=29;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_8=10722;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2FUtility.vala;0;4
FILE_NAME_9=1744;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fsrc%2Fmakefile;0;4
FILE_NAME_10=167;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fdebian%2Fcontrol;0;4
FILE_NAME_11=139;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager%2Fdebian%2Fchangelog;0;4
FILE_NAME_0=30;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FAboutWindow.vala;0;4
FILE_NAME_1=33;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manage2r%2Fsrc%2FDonationWindow.vala;0;4
FILE_NAME_2=34;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FEditThemeWindow.vala;0;4
FILE_NAME_3=35;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FEditWidgetWindow.vala;0;4
FILE_NAME_4=2589;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FGeneratePreviewWindow.vala;0;4
FILE_NAME_5=21828;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FMain.vala;0;4
FILE_NAME_6=29;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FMainWindow.vala;0;4
FILE_NAME_7=29;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FSettingsWindow.vala;0;4
FILE_NAME_8=10722;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2FUtility.vala;0;4
FILE_NAME_9=1744;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fsrc%2Fmakefile;0;4
FILE_NAME_10=167;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fdebian%2Fcontrol;0;4
FILE_NAME_11=139;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fconky-manager2%2Fdebian%2Fchangelog;0;4

[VTE]
last_dir=/home/teejee
Expand All @@ -52,10 +52,10 @@ ValaFT_01_CM=make
ValaFT_01_WD=
filetypes=Vala;
EX_00_LB=_Execute
EX_00_CM=./conky-manager
EX_00_CM=./conky-manager2
EX_00_WD=
EX_01_LB=Execute (sudo)
EX_01_CM=gksu ./conky-manager
EX_01_CM=gksu ./conky-manager2
EX_01_WD=

[editor]
Expand Down
Loading