| 1 | *** /home/urys/kompilace/guake-0.4.1_org/src/guake.py 2010-01-20 11:23:00.000000000 +0100 |
|---|
| 2 | --- /home/urys/kompilace/guake-0.4.1/src/guake.py 2010-03-24 19:02:49.568957769 +0100 |
|---|
| 3 | *************** |
|---|
| 4 | *** 44,50 **** |
|---|
| 5 | from common import test_gconf, pixmapfile, gladefile, ShowableError, _ |
|---|
| 6 | from guake_globals import NAME, VERSION, LOCALE_DIR, KEY, GCONF_PATH, \ |
|---|
| 7 | TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \ |
|---|
| 8 | ! ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER |
|---|
| 9 | |
|---|
| 10 | pynotify.init('Guake!') |
|---|
| 11 | |
|---|
| 12 | --- 44,50 ---- |
|---|
| 13 | from common import test_gconf, pixmapfile, gladefile, ShowableError, _ |
|---|
| 14 | from guake_globals import NAME, VERSION, LOCALE_DIR, KEY, GCONF_PATH, \ |
|---|
| 15 | TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \ |
|---|
| 16 | ! ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM |
|---|
| 17 | |
|---|
| 18 | pynotify.init('Guake!') |
|---|
| 19 | |
|---|
| 20 | *************** |
|---|
| 21 | *** 788,799 **** |
|---|
| 22 | --- 788,801 ---- |
|---|
| 23 | height = self.client.get_int(KEY('/general/window_height')) |
|---|
| 24 | width = 100 |
|---|
| 25 | halignment = self.client.get_int(KEY('/general/window_halignment')) |
|---|
| 26 | + valignment = self.client.get_int(KEY('/general/window_valignment')) |
|---|
| 27 | |
|---|
| 28 | # get the rectangle just from the first/default monitor in the |
|---|
| 29 | # future we might create a field to select which monitor you |
|---|
| 30 | # wanna use |
|---|
| 31 | window_rect = screen.get_monitor_geometry(0) |
|---|
| 32 | total_width = window_rect.width |
|---|
| 33 | + total_height = window_rect.height |
|---|
| 34 | window_rect.height = window_rect.height * height / 100 |
|---|
| 35 | window_rect.width = window_rect.width * width / 100 |
|---|
| 36 | |
|---|
| 37 | *************** |
|---|
| 38 | *** 804,810 **** |
|---|
| 39 | --- 806,817 ---- |
|---|
| 40 | window_rect.x = 0 |
|---|
| 41 | elif halignment == ALIGN_RIGHT: |
|---|
| 42 | window_rect.x = total_width - window_rect.width |
|---|
| 43 | + |
|---|
| 44 | window_rect.y = 0 |
|---|
| 45 | + if height < total_height: |
|---|
| 46 | + if valignment == ALIGN_BOTTOM: |
|---|
| 47 | + window_rect.y = (total_height - window_rect.height) |
|---|
| 48 | + |
|---|
| 49 | return window_rect |
|---|
| 50 | |
|---|
| 51 | def get_running_fg_processes(self): |
|---|
